Changeset 159531 in webkit for trunk/Source/JavaScriptCore/API/JSContextRef.cpp

Timestamp:

Nov 19, 2013, 4:29:43 PM (12 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r159459.
​http://trac.webkit.org/changeset/159459
​https://bugs.webkit.org/show_bug.cgi?id=124616

tons of assertions on launch (Requested by thorton on
#webkit).

• API/JSContext.mm:

(-[JSContext setException:]):
(-[JSContext wrapperForObjCObject:]):
(-[JSContext wrapperForJSObject:]):

• API/JSContextRef.cpp:

(JSContextGroupRelease):
(JSGlobalContextRelease):

• API/JSManagedValue.mm:

(-[JSManagedValue initWithValue:]):
(-[JSManagedValue value]):

• API/JSObjectRef.cpp:

(JSObjectIsFunction):
(JSObjectCopyPropertyNames):

• API/JSValue.mm:

(containerValueToObject):

• API/JSWrapperMap.mm:

(tryUnwrapObjcObject):

File:

• trunk/Source/JavaScriptCore/API/JSContextRef.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -69 +69 @@
 void JSContextGroupRelease(JSContextGroupRef group)
 {
+    IdentifierTable* savedIdentifierTable;
     VM& vm = *toJS(group);
-    APIEntryShim entryShim(&vm);
-    vm.deref();
+
+    {
+        JSLockHolder lock(vm);
+        savedIdentifierTable = wtfThreadData().setCurrentIdentifierTable(vm.identifierTable);
+        vm.deref();
+    }
+
+    wtfThreadData().setCurrentIdentifierTable(savedIdentifierTable);
 }
 
@@ -159 +166 @@
     ExecState* exec = toJS(ctx);
     {
-        APIEntryShim entryShim(exec);
+        JSLockHolder lock(exec);
 
         VM& vm = exec->vm();