Changeset 246365 in webkit

Timestamp:

Jun 12, 2019, 11:16:10 AM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r246084. rdar://problem/51670920

Unreviewed, update exception scope for putByIndexBeyondVectorLength
​https://bugs.webkit.org/show_bug.cgi?id=198477

• runtime/JSObject.cpp: (JSC::JSObject::putByIndexBeyondVectorLength):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@246084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-607.3.1.2-branch/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSObject.cpp (modified) (5 diffs)

branches/safari-607.3.1.2-branch/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-06-12  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r246084. rdar://problem/51670920
+
+    Unreviewed, update exception scope for putByIndexBeyondVectorLength
+    https://bugs.webkit.org/show_bug.cgi?id=198477
+    
+    * runtime/JSObject.cpp:
+    (JSC::JSObject::putByIndexBeyondVectorLength):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246084 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-06-04  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            Unreviewed, update exception scope for putByIndexBeyondVectorLength
+            https://bugs.webkit.org/show_bug.cgi?id=198477
+
+            * runtime/JSObject.cpp:
+            (JSC::JSObject::putByIndexBeyondVectorLength):
+
 2019-06-12  Alan Coon  <alancoon@apple.com>
 

branches/safari-607.3.1.2-branch/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -2863 +2863 @@
 {
     VM& vm = exec->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
 
     RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(!isCopyOnWrite(indexingMode()));
@@ -2872 +2873 @@
     case ALL_BLANK_INDEXING_TYPES: {
         if (indexingShouldBeSparse(vm)) {
-            return putByIndexBeyondVectorLengthWithArrayStorage(
+            RELEASE_AND_RETURN(scope, putByIndexBeyondVectorLengthWithArrayStorage(
                 exec, i, value, shouldThrow,
-                ensureArrayStorageExistsAndEnterDictionaryIndexingMode(vm));
+                ensureArrayStorageExistsAndEnterDictionaryIndexingMode(vm)));
         }
         if (indexIsSufficientlyBeyondLengthForSparseMap(i, 0) || i >= MIN_SPARSE_ARRAY_INDEX) {
-            return putByIndexBeyondVectorLengthWithArrayStorage(
-                exec, i, value, shouldThrow, createArrayStorage(vm, 0, 0));
+            RELEASE_AND_RETURN(scope, putByIndexBeyondVectorLengthWithArrayStorage(exec, i, value, shouldThrow, createArrayStorage(vm, 0, 0)));
         }
         if (needsSlowPutIndexing(vm)) {
             // Convert the indexing type to the SlowPutArrayStorage and retry.
             createArrayStorage(vm, i + 1, getNewVectorLength(vm, 0, 0, 0, i + 1));
-            return putByIndex(this, exec, i, value, shouldThrow);
+            RELEASE_AND_RETURN(scope, putByIndex(this, exec, i, value, shouldThrow));
         }
         
@@ -2896 +2896 @@
         
     case ALL_INT32_INDEXING_TYPES:
-        return putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(exec, i, value);
+        RELEASE_AND_RETURN(scope, putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(exec, i, value));
         
     case ALL_DOUBLE_INDEXING_TYPES:
-        return putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(exec, i, value);
+        RELEASE_AND_RETURN(scope, putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(exec, i, value));
         
     case ALL_CONTIGUOUS_INDEXING_TYPES:
-        return putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(exec, i, value);
+        RELEASE_AND_RETURN(scope, putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(exec, i, value));
         
     case NonArrayWithSlowPutArrayStorage:
     case ArrayWithSlowPutArrayStorage: {
         // No own property present in the vector, but there might be in the sparse map!
-        auto scope = DECLARE_THROW_SCOPE(vm);
         SparseArrayValueMap* map = arrayStorage()->m_sparseMap.get();
         bool putResult = false;
@@ -2916 +2915 @@
                 return putResult;
         }
-        scope.release();
         FALLTHROUGH;
     }
@@ -2922 +2920 @@
     case NonArrayWithArrayStorage:
     case ArrayWithArrayStorage:
-        return putByIndexBeyondVectorLengthWithArrayStorage(exec, i, value, shouldThrow, arrayStorage());
+        RELEASE_AND_RETURN(scope, putByIndexBeyondVectorLengthWithArrayStorage(exec, i, value, shouldThrow, arrayStorage()));
         
     default: