Changeset 127349 in webkit for trunk/Source/JavaScriptCore/runtime/JSArray.h

Timestamp:

Aug 31, 2012, 6:50:13 PM (13 years ago)

Author:

[email protected]

Message:

JSArray::putDirectIndex should by default behave like JSObject::putDirect
​https://bugs.webkit.org/show_bug.cgi?id=95630

Reviewed by Gavin Barraclough.

Source/JavaScriptCore:

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• jsc.cpp:

(GlobalObject::finishCreation):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• runtime/JSArray.cpp:

(JSC::SparseArrayValueMap::putDirect):
(JSC::JSArray::defineOwnNumericProperty):
(JSC::JSArray::putDirectIndexBeyondVectorLength):

• runtime/JSArray.h:

(SparseArrayValueMap):
(JSArray):
(JSC::JSArray::putDirectIndex):

• runtime/JSONObject.cpp:

(JSC::Walker::walk):

• runtime/RegExpMatchesArray.cpp:

(JSC::RegExpMatchesArray::reifyAllProperties):
(JSC::RegExpMatchesArray::reifyMatchProperty):

• runtime/StringPrototype.cpp:

(JSC::splitStringByOneCharacterImpl):
(JSC::stringProtoFuncSplit):

Source/WebCore:

No new tests because no change in behavior.

• bindings/js/SerializedScriptValue.cpp:

(WebCore::CloneDeserializer::putProperty):

File:

• trunk/Source/JavaScriptCore/runtime/JSArray.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/runtime/JSArray.h

@@ -31 +31 @@
     class LLIntOffsetsExtractor;
 
+    enum PutDirectIndexMode { PutDirectIndexLikePutDirect, PutDirectIndexShouldNotThrow, PutDirectIndexShouldThrow };
+
     struct SparseArrayEntry : public WriteBarrier<Unknown> {
         typedef WriteBarrier<Unknown> Base;
@@ -88 +90 @@
         // These methods may mutate the contents of the map
         void put(ExecState*, JSArray*, unsigned, JSValue, bool shouldThrow);
-        bool putDirect(ExecState*, JSArray*, unsigned, JSValue, bool shouldThrow);
+        bool putDirect(ExecState*, JSArray*, unsigned, JSValue, PutDirectIndexMode);
         AddResult add(JSArray*, unsigned);
         iterator find(unsigned i) { return m_map.find(i); }
@@ -174 +176 @@
         //  - the prototype chain is not consulted
         //  - accessors are not called.
+        //  - it will ignore extensibility and read-only properties if PutDirectIndexLikePutDirect is passed as the mode (the default).
         // This method creates a property with attributes writable, enumerable and configurable all set to true.
-        bool putDirectIndex(ExecState* exec, unsigned propertyName, JSValue value, bool shouldThrow = true)
+        bool putDirectIndex(ExecState* exec, unsigned propertyName, JSValue value, PutDirectIndexMode mode = PutDirectIndexLikePutDirect)
         {
             if (canSetIndex(propertyName)) {
@@ -181 +184 @@
                 return true;
             }
-            return putDirectIndexBeyondVectorLength(exec, propertyName, value, shouldThrow);
+            return putDirectIndexBeyondVectorLength(exec, propertyName, value, mode);
         }
 
@@ -303 +306 @@
 
         void putByIndexBeyondVectorLength(ExecState*, unsigned propertyName, JSValue, bool shouldThrow);
-        JS_EXPORT_PRIVATE bool putDirectIndexBeyondVectorLength(ExecState*, unsigned propertyName, JSValue, bool shouldThrow);
+        JS_EXPORT_PRIVATE bool putDirectIndexBeyondVectorLength(ExecState*, unsigned propertyName, JSValue, PutDirectIndexMode);
 
         unsigned getNewVectorLength(unsigned desiredLength);