Changeset 34118 in webkit for trunk/JavaScriptCore/kjs/regexp_object.cpp

Timestamp:

May 25, 2008, 12:15:42 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Changed regular expression matching result array to be lazily filled, because many callers
only care about it being non-null.

2% improvement on Acid3 test 26.

• kjs/array_instance.cpp: Added a void* member to ArrayStorage for ArrayInstance subclasses to use.
• kjs/array_instance.h: (KJS::ArrayInstance::lazyCreationData): (KJS::ArrayInstance::setLazyCreationData): Added methods to access it from subclasses.

• kjs/regexp_object.cpp: (KJS::RegExpMatchesArray::RegExpMatchesArray): (KJS::RegExpMatchesArray::getOwnPropertySlot): (KJS::RegExpMatchesArray::put): (KJS::RegExpMatchesArray::deleteProperty): (KJS::RegExpMatchesArray::getPropertyNames): (KJS::RegExpMatchesArray::fillArrayInstanceIfNeeded): (KJS::RegExpMatchesArray::~RegExpMatchesArray): (KJS::RegExpObjectImp::arrayOfMatches): RegExpMatchesArray is a subclass of ArrayInstance that isn't filled until accessed for the first time.

File:

• trunk/JavaScriptCore/kjs/regexp_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -315 +315 @@
 }
 
+class RegExpMatchesArray : public ArrayInstance {
+public:
+    RegExpMatchesArray(ExecState*, RegExpObjectImpPrivate*);
+
+    virtual ~RegExpMatchesArray();
+
+    virtual bool getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) { if (!lazyCreationData()) fillArrayInstance(exec); return ArrayInstance::getOwnPropertySlot(exec, propertyName, slot); }
+    virtual bool getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot) { if (!lazyCreationData()) fillArrayInstance(exec); return ArrayInstance::getOwnPropertySlot(exec, propertyName, slot); }
+    virtual void put(ExecState* exec, const Identifier& propertyName, JSValue* v) { if (!lazyCreationData()) fillArrayInstance(exec); ArrayInstance::put(exec, propertyName, v); }
+    virtual void put(ExecState* exec, unsigned propertyName, JSValue* v) { if (!lazyCreationData()) fillArrayInstance(exec); ArrayInstance::put(exec, propertyName, v); }
+    virtual bool deleteProperty(ExecState* exec, const Identifier& propertyName) { if (!lazyCreationData()) fillArrayInstance(exec); return ArrayInstance::deleteProperty(exec, propertyName); }
+    virtual bool deleteProperty(ExecState* exec, unsigned propertyName) { if (!lazyCreationData()) fillArrayInstance(exec); return ArrayInstance::deleteProperty(exec, propertyName); }
+    virtual void getPropertyNames(ExecState* exec, PropertyNameArray& arr) { if (!lazyCreationData()) fillArrayInstance(exec); ArrayInstance::getPropertyNames(exec, arr); }
+
+private:
+    void fillArrayInstance(ExecState*);
+};
+
+RegExpMatchesArray::RegExpMatchesArray(ExecState* exec, RegExpObjectImpPrivate* data)
+    : ArrayInstance(exec->lexicalGlobalObject()->arrayPrototype(), data->lastNumSubPatterns + 1)
+{
+    RegExpObjectImpPrivate* d = new RegExpObjectImpPrivate;
+    d->lastInput = data->lastInput;
+    d->lastNumSubPatterns = data->lastNumSubPatterns;
+    unsigned offsetVectorSize = (data->lastNumSubPatterns + 1) * 2; // only copying the result part of the vector
+    d->lastOvector.set(new int[offsetVectorSize]);
+    memcpy(d->lastOvector.get(), data->lastOvector.get(), offsetVectorSize * sizeof(int));
+    // d->multiline is not needed, and remains uninitialized
+
+    setLazyCreationData(d);
+}
+
+RegExpMatchesArray::~RegExpMatchesArray()
+{
+    delete static_cast<RegExpObjectImpPrivate*>(lazyCreationData());
+}
+
+void RegExpMatchesArray::fillArrayInstance(ExecState* exec)
+{
+    RegExpObjectImpPrivate* d = static_cast<RegExpObjectImpPrivate*>(lazyCreationData());
+    ASSERT(d);
+
+    unsigned lastNumSubpatterns = d->lastNumSubPatterns;
+
+    for (unsigned i = 0; i <= lastNumSubpatterns; ++i) {
+        int start = d->lastOvector[2 * i];
+        if (start >= 0)
+            ArrayInstance::put(exec, i, jsString(d->lastInput.substr(start, d->lastOvector[2 * i + 1] - start)));
+    }
+    ArrayInstance::put(exec, exec->propertyNames().index, jsNumber(d->lastOvector[0]));
+    ArrayInstance::put(exec, exec->propertyNames().input, jsString(d->lastInput));
+
+    delete d;
+    setLazyCreationData(0);
+}
+
 JSObject* RegExpObjectImp::arrayOfMatches(ExecState* exec) const
 {
-  unsigned lastNumSubpatterns = d->lastNumSubPatterns;
-  ArrayInstance* arr = new ArrayInstance(exec->lexicalGlobalObject()->arrayPrototype(), lastNumSubpatterns + 1);
-  for (unsigned i = 0; i <= lastNumSubpatterns; ++i) {
-    int start = d->lastOvector[2 * i];
-    if (start >= 0)
-      arr->put(exec, i, jsString(d->lastInput.substr(start, d->lastOvector[2 * i + 1] - start)));
-  }
-  arr->put(exec, exec->propertyNames().index, jsNumber(d->lastOvector[0]));
-  arr->put(exec, exec->propertyNames().input, jsString(d->lastInput));
-  return arr;
+    return new RegExpMatchesArray(exec, d.get());
 }