Changeset 167326 in webkit for trunk/Source/JavaScriptCore/API/JSBase.cpp

Timestamp:

Apr 15, 2014, 2:05:09 PM (11 years ago)

Author:

[email protected]

Message:

Objective-C API external object graphs don't handle generational collection properly
​https://bugs.webkit.org/show_bug.cgi?id=131634

Reviewed by Geoffrey Garen.

If the set of Objective-C objects transitively reachable through an object changes, we
need to update the set of opaque roots accordingly. If we don't, the next EdenCollection
won't rescan the external object graph, which would lead us to consider a newly allocated
JSManagedValue to be dead.

• API/JSBase.cpp:

(JSSynchronousEdenCollectForDebugging):

• API/JSVirtualMachine.mm:

(-[JSVirtualMachine initWithContextGroupRef:]):
(-[JSVirtualMachine dealloc]):
(-[JSVirtualMachine isOldExternalObject:]):
(-[JSVirtualMachine addExternalRememberedObject:]):
(-[JSVirtualMachine addManagedReference:withOwner:]):
(-[JSVirtualMachine removeManagedReference:withOwner:]):
(-[JSVirtualMachine externalRememberedSet]):
(scanExternalObjectGraph):
(scanExternalRememberedSet):

• API/JSVirtualMachineInternal.h:
• API/tests/testapi.mm:
• heap/Heap.cpp:

(JSC::Heap::markRoots):

• heap/Heap.h:

(JSC::Heap::slotVisitor):

• heap/SlotVisitor.h:
• heap/SlotVisitorInlines.h:

(JSC::SlotVisitor::containsOpaqueRoot):
(JSC::SlotVisitor::containsOpaqueRootTriState):

File:

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

trunk/Source/JavaScriptCore/API/JSBase.cpp

@@ -143 +143 @@
 
 extern "C" JS_EXPORT void JSSynchronousGarbageCollectForDebugging(JSContextRef);
+extern "C" JS_EXPORT void JSSynchronousEdenCollectForDebugging(JSContextRef);
 
 void JSSynchronousGarbageCollectForDebugging(JSContextRef ctx)
@@ -152 +153 @@
     JSLockHolder locker(exec);
     exec->vm().heap.collectAllGarbage();
+}
+
+void JSSynchronousEdenCollectForDebugging(JSContextRef ctx)
+{
+    if (!ctx)
+        return;
+
+    ExecState* exec = toJS(ctx);
+    JSLockHolder locker(exec);
+    exec->vm().heap.collect(EdenCollection);
 }