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

Timestamp:

Jan 30, 2013, 2:46:54 PM (13 years ago)

Author:

[email protected]

Message:

Objective-C API: JSContext's dealloc causes ASSERT due to ordering of releases
​https://bugs.webkit.org/show_bug.cgi?id=107978

Reviewed by Filip Pizlo.

We need to add the Identifier table save/restore in JSContextGroupRelease so that we
have the correct table if we end up destroying the JSGlobalData/Heap.

• API/JSContextRef.cpp:

(JSContextGroupRelease):

File:

• trunk/Source/JavaScriptCore/API/JSContextRef.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -67 +67 @@
 void JSContextGroupRelease(JSContextGroupRef group)
 {
-    toJS(group)->deref();
+    IdentifierTable* savedIdentifierTable;
+    JSGlobalData& globalData = *toJS(group);
+
+    {
+        JSLockHolder lock(globalData);
+        savedIdentifierTable = wtfThreadData().setCurrentIdentifierTable(globalData.identifierTable);
+        globalData.deref();
+    }
+
+    wtfThreadData().setCurrentIdentifierTable(savedIdentifierTable);
 }