Changeset 109008 in webkit for trunk/Source/JavaScriptCore/runtime/RegExpObject.h

Timestamp:

Feb 27, 2012, 10:29:04 AM (13 years ago)

Author:

[email protected]

Message:

RegExp lastIndex should behave as a regular property
​https://bugs.webkit.org/show_bug.cgi?id=79446

Reviewed by Sam Weinig.

lastIndex should be a regular data descriptor, with the attributes configurable:false,
enumerable:false, writable:true. As such, it should be possible to reconfigure writable
as false. If the lastIndex property is reconfigured to be read-only, we should respect
this correctly.

Source/JavaScriptCore:

• runtime/CommonIdentifiers.h:
  • Removed some unused identifiers, added lastIndex.
• runtime/RegExpObject.cpp:

(JSC::RegExpObject::getOwnPropertySlot):

• lastIndex is no longer a static value, provided specific handling.

(JSC::RegExpObject::getOwnPropertyDescriptor):

• lastIndex is no longer a static value, provided specific handling.

(JSC::RegExpObject::deleteProperty):

• lastIndex is no longer a static value, provided specific handling.

(JSC::RegExpObject::getOwnPropertyNames):

• lastIndex is no longer a static value, provided specific handling.

(JSC::RegExpObject::getPropertyNames):

• lastIndex is no longer a static value, provided specific handling.

(JSC::reject):

• helper function for defineOwnProperty.

(JSC::RegExpObject::defineOwnProperty):

• lastIndex is no longer a static value, provided specific handling.

(JSC::RegExpObject::put):

• lastIndex is no longer a static value, provided specific handling.

(JSC::RegExpObject::match):

• Pass setLastIndex an ExecState, so it can throw if read-only.

• runtime/RegExpObject.h:

(JSC::RegExpObject::setLastIndex):

• Pass setLastIndex an ExecState, so it can throw if read-only.

(RegExpObjectData):

• Added lastIndexIsWritable.

• runtime/RegExpPrototype.cpp:

(JSC::regExpProtoFuncCompile):

• Pass setLastIndex an ExecState, so it can throw if read-only.

LayoutTests:

• fast/regex/lastIndex-expected.txt: Added.
• fast/regex/lastIndex.html: Added.
• fast/regex/script-tests/lastIndex.js: Added.
  • Added test cases for correct handling of lastIndex.

File:

• trunk/Source/JavaScriptCore/runtime/RegExpObject.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/RegExpObject.h

@@ -48 +48 @@
         RegExp* regExp() const { return d->regExp.get(); }
 
-        void setLastIndex(size_t lastIndex)
+        void setLastIndex(ExecState* exec, size_t lastIndex)
         {
             d->lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
+            if (LIKELY(d->lastIndexIsWritable))
+                d->lastIndex.setWithoutWriteBarrier(jsNumber(lastIndex));
+            else
+                throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
         }
-        void setLastIndex(JSGlobalData& globalData, JSValue lastIndex)
+        void setLastIndex(ExecState* exec, JSValue lastIndex, bool shouldThrow)
         {
-            d->lastIndex.set(globalData, this, lastIndex);
+            if (LIKELY(d->lastIndexIsWritable))
+                d->lastIndex.set(exec->globalData(), this, lastIndex);
+            else if (shouldThrow)
+                throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
         }
         JSValue getLastIndex() const
@@ -84 +91 @@
         static void visitChildren(JSCell*, SlotVisitor&);
 
+        JS_EXPORT_PRIVATE static bool deleteProperty(JSCell*, ExecState*, const Identifier& propertyName);
+        JS_EXPORT_PRIVATE static void getOwnPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
+        JS_EXPORT_PRIVATE static void getPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);
+        JS_EXPORT_PRIVATE static bool defineOwnProperty(JSObject*, ExecState*, const Identifier& propertyName, PropertyDescriptor&, bool shouldThrow);
+
     private:
         bool match(ExecState*);
@@ -92 +104 @@
             RegExpObjectData(JSGlobalData& globalData, RegExpObject* owner, RegExp* regExp)
                 : regExp(globalData, owner, regExp)
+                , lastIndexIsWritable(true)
             {
                 lastIndex.setWithoutWriteBarrier(jsNumber(0));
@@ -98 +111 @@
             WriteBarrier<RegExp> regExp;
             WriteBarrier<Unknown> lastIndex;
+            bool lastIndexIsWritable;
         };
 #if COMPILER(MSVC)