Changeset 209023 in webkit

Timestamp:

Nov 28, 2016 2:39:10 PM (7 years ago)

Author:

mark.lam@apple.com

Message:

Fix exception scope verification failures in runtime/Weak* files.
​https://bugs.webkit.org/show_bug.cgi?id=165096

Reviewed by Geoffrey Garen.

• runtime/WeakMapConstructor.cpp:

(JSC::constructWeakMap):

• runtime/WeakMapPrototype.cpp:

(JSC::protoFuncWeakMapSet):

• runtime/WeakSetConstructor.cpp:

(JSC::constructWeakSet):

• runtime/WeakSetPrototype.cpp:

(JSC::protoFuncWeakSetAdd):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/WeakMapConstructor.cpp (modified) (3 diffs)
• runtime/WeakMapPrototype.cpp (modified) (1 diff)
• runtime/WeakSetConstructor.cpp (modified) (2 diffs)
• runtime/WeakSetPrototype.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-11-28  Mark Lam  <mark.lam@apple.com>
+
+        Fix exception scope verification failures in runtime/Weak* files.
+        https://bugs.webkit.org/show_bug.cgi?id=165096
+
+        Reviewed by Geoffrey Garen.
+
+        * runtime/WeakMapConstructor.cpp:
+        (JSC::constructWeakMap):
+        * runtime/WeakMapPrototype.cpp:
+        (JSC::protoFuncWeakMapSet):
+        * runtime/WeakSetConstructor.cpp:
+        (JSC::constructWeakSet):
+        * runtime/WeakSetPrototype.cpp:
+        (JSC::protoFuncWeakSetAdd):
+
 2016-11-28  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp

@@ -66 +66 @@
         return JSValue::encode(weakMap);
 
-    JSValue adderFunction = weakMap->JSObject::get(exec, exec->propertyNames().set);
+    JSValue adderFunction = weakMap->JSObject::get(exec, vm.propertyNames->set);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
@@ -74 +74 @@
         return JSValue::encode(throwTypeError(exec, scope));
 
+    scope.release();
     forEachInIterable(exec, iterable, [&](VM& vm, ExecState* exec, JSValue nextItem) {
         auto scope = DECLARE_THROW_SCOPE(vm);
@@ -90 +91 @@
         arguments.append(key);
         arguments.append(value);
+        scope.release();
         call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, weakMap, arguments);
     });

trunk/Source/JavaScriptCore/runtime/WeakMapPrototype.cpp

@@ -106 +106 @@
 
     WeakMapData* map = getWeakMapData(callFrame, callFrame->thisValue());
+    ASSERT(!!scope.exception() == !map);
     if (!map)
         return JSValue::encode(jsUndefined());

trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp

@@ -66 +66 @@
         return JSValue::encode(weakSet);
 
-    JSValue adderFunction = weakSet->JSObject::get(exec, exec->propertyNames().add);
+    JSValue adderFunction = weakSet->JSObject::get(exec, vm.propertyNames->add);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
@@ -74 +74 @@
         return JSValue::encode(throwTypeError(exec, scope));
 
+    scope.release();
     forEachInIterable(exec, iterable, [&](VM&, ExecState* exec, JSValue nextValue) {
         MarkedArgumentBuffer arguments;

trunk/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp

@@ -93 +93 @@
 
     WeakMapData* map = getWeakMapData(callFrame, callFrame->thisValue());
+    ASSERT(!!scope.exception() == !map);
     if (!map)
         return JSValue::encode(jsUndefined());