Changeset 209023 in webkit
- Timestamp:
- Nov 28, 2016 2:39:10 PM (7 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r209022 r209023 1 2016-11-28 Mark Lam <mark.lam@apple.com> 2 3 Fix exception scope verification failures in runtime/Weak* files. 4 https://bugs.webkit.org/show_bug.cgi?id=165096 5 6 Reviewed by Geoffrey Garen. 7 8 * runtime/WeakMapConstructor.cpp: 9 (JSC::constructWeakMap): 10 * runtime/WeakMapPrototype.cpp: 11 (JSC::protoFuncWeakMapSet): 12 * runtime/WeakSetConstructor.cpp: 13 (JSC::constructWeakSet): 14 * runtime/WeakSetPrototype.cpp: 15 (JSC::protoFuncWeakSetAdd): 16 1 17 2016-11-28 Mark Lam <mark.lam@apple.com> 2 18 -
trunk/Source/JavaScriptCore/runtime/WeakMapConstructor.cpp
r206386 r209023 66 66 return JSValue::encode(weakMap); 67 67 68 JSValue adderFunction = weakMap->JSObject::get(exec, exec->propertyNames().set);68 JSValue adderFunction = weakMap->JSObject::get(exec, vm.propertyNames->set); 69 69 RETURN_IF_EXCEPTION(scope, encodedJSValue()); 70 70 … … 74 74 return JSValue::encode(throwTypeError(exec, scope)); 75 75 76 scope.release(); 76 77 forEachInIterable(exec, iterable, [&](VM& vm, ExecState* exec, JSValue nextItem) { 77 78 auto scope = DECLARE_THROW_SCOPE(vm); … … 90 91 arguments.append(key); 91 92 arguments.append(value); 93 scope.release(); 92 94 call(exec, adderFunction, adderFunctionCallType, adderFunctionCallData, weakMap, arguments); 93 95 }); -
trunk/Source/JavaScriptCore/runtime/WeakMapPrototype.cpp
r205462 r209023 106 106 107 107 WeakMapData* map = getWeakMapData(callFrame, callFrame->thisValue()); 108 ASSERT(!!scope.exception() == !map); 108 109 if (!map) 109 110 return JSValue::encode(jsUndefined()); -
trunk/Source/JavaScriptCore/runtime/WeakSetConstructor.cpp
r206386 r209023 66 66 return JSValue::encode(weakSet); 67 67 68 JSValue adderFunction = weakSet->JSObject::get(exec, exec->propertyNames().add);68 JSValue adderFunction = weakSet->JSObject::get(exec, vm.propertyNames->add); 69 69 RETURN_IF_EXCEPTION(scope, encodedJSValue()); 70 70 … … 74 74 return JSValue::encode(throwTypeError(exec, scope)); 75 75 76 scope.release(); 76 77 forEachInIterable(exec, iterable, [&](VM&, ExecState* exec, JSValue nextValue) { 77 78 MarkedArgumentBuffer arguments; -
trunk/Source/JavaScriptCore/runtime/WeakSetPrototype.cpp
r205462 r209023 93 93 94 94 WeakMapData* map = getWeakMapData(callFrame, callFrame->thisValue()); 95 ASSERT(!!scope.exception() == !map); 95 96 if (!map) 96 97 return JSValue::encode(jsUndefined());
Note: See TracChangeset
for help on using the changeset viewer.