Changeset 164463 in webkit

Timestamp:

Feb 20, 2014 6:53:14 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

DefaultGCActivityCallback::doWork() should reschedule if GC is deferred.
<​https://webkit.org/b/129131>

Reviewed by Mark Hahnenberg.

Currently, DefaultGCActivityCallback::doWork() does not check if the GC
needs to be deferred before commencing. As a result, the GC may crash
and/or corrupt data because the VM is not in the consistent state needed
for the GC to run. With this fix, doWork() now checks if the GC is
supposed to be deferred and re-schedules if needed. It only commences
with GC'ing when it's safe to do so.

• runtime/GCActivityCallback.cpp:

(JSC::DefaultGCActivityCallback::doWork):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/GCActivityCallback.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-02-20  Mark Lam  <mark.lam@apple.com>
+
+        DefaultGCActivityCallback::doWork() should reschedule if GC is deferred.
+        <https://webkit.org/b/129131>
+
+        Reviewed by Mark Hahnenberg.
+
+        Currently, DefaultGCActivityCallback::doWork() does not check if the GC
+        needs to be deferred before commencing. As a result, the GC may crash
+        and/or corrupt data because the VM is not in the consistent state needed
+        for the GC to run. With this fix, doWork() now checks if the GC is
+        supposed to be deferred and re-schedules if needed. It only commences
+        with GC'ing when it's safe to do so.
+
+        * runtime/GCActivityCallback.cpp:
+        (JSC::DefaultGCActivityCallback::doWork):
+
 2014-02-20  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/runtime/GCActivityCallback.cpp

@@ -88 +88 @@
     
     APIEntryShim shim(m_vm);
+    if (heap->isDeferred()) {
+        scheduleTimer(0);
+        return;
+    }
+
 #if !PLATFORM(IOS)
     double startTime = WTF::monotonicallyIncreasingTime();