Changeset 190546 in webkit for trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp

Timestamp:

Oct 3, 2015, 6:45:21 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r190522.
​https://bugs.webkit.org/show_bug.cgi?id=149787

Caused a lot of leaks (Requested by ap on #webkit).

Reverted changeset:

"Unreviewed, rolling back in r190450"
​https://bugs.webkit.org/show_bug.cgi?id=149727
​http://trac.webkit.org/changeset/190522

File:

• trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp (modified) (9 diffs)

trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp

@@ -132 +132 @@
 } // anonymous namespace
 
-Plan::Plan(CodeBlock* passedCodeBlock, CodeBlock* profiledDFGCodeBlock,
+Plan::Plan(PassRefPtr<CodeBlock> passedCodeBlock, CodeBlock* profiledDFGCodeBlock,
     CompilationMode mode, unsigned osrEntryBytecodeIndex,
     const Operands<JSValue>& mustHandleValues)
@@ -141 +141 @@
     , osrEntryBytecodeIndex(osrEntryBytecodeIndex)
     , mustHandleValues(mustHandleValues)
-    , compilation(codeBlock->vm()->m_perBytecodeProfiler ? adoptRef(new Profiler::Compilation(codeBlock->vm()->m_perBytecodeProfiler->ensureBytecodesFor(codeBlock), profilerCompilationKindForMode(mode))) : 0)
+    , compilation(codeBlock->vm()->m_perBytecodeProfiler ? adoptRef(new Profiler::Compilation(codeBlock->vm()->m_perBytecodeProfiler->ensureBytecodesFor(codeBlock.get()), profilerCompilationKindForMode(mode))) : 0)
     , inlineCallFrames(adoptRef(new InlineCallFrameSet()))
-    , identifiers(codeBlock)
-    , weakReferences(codeBlock)
+    , identifiers(codeBlock.get())
+    , weakReferences(codeBlock.get())
     , willTryToTierUp(false)
     , stage(Preparing)
@@ -536 +536 @@
 void Plan::reallyAdd(CommonData* commonData)
 {
-    watchpoints.reallyAdd(codeBlock, *commonData);
+    watchpoints.reallyAdd(codeBlock.get(), *commonData);
     identifiers.reallyAdd(vm, commonData);
     weakReferences.reallyAdd(vm, commonData);
@@ -554 +554 @@
 void Plan::notifyReady()
 {
-    callback->compilationDidBecomeReadyAsynchronously(codeBlock, profiledDFGCodeBlock);
+    callback->compilationDidBecomeReadyAsynchronously(codeBlock.get());
     stage = Ready;
 }
@@ -561 +561 @@
 {
     // We will establish new references from the code block to things. So, we need a barrier.
-    vm.heap.writeBarrier(codeBlock);
+    vm.heap.writeBarrier(codeBlock->ownerExecutable());
     
     if (!isStillValid())
@@ -597 +597 @@
 void Plan::finalizeAndNotifyCallback()
 {
-    callback->compilationDidComplete(codeBlock, profiledDFGCodeBlock, finalizeWithoutNotifyingCallback());
+    callback->compilationDidComplete(codeBlock.get(), finalizeWithoutNotifyingCallback());
 }
 
@@ -605 +605 @@
 }
 
-void Plan::rememberCodeBlocks()
+void Plan::clearCodeBlockMarks()
 {
     // Compilation writes lots of values to a CodeBlock without performing
@@ -611 +611 @@
     // all our CodeBlocks must be visited during GC.
 
-    Heap::heap(codeBlock)->writeBarrier(codeBlock);
+    codeBlock->clearMarks();
+    codeBlock->alternative()->clearMarks();
     if (profiledDFGCodeBlock)
-        Heap::heap(profiledDFGCodeBlock)->writeBarrier(profiledDFGCodeBlock);
+        profiledDFGCodeBlock->clearMarks();
 }
 
@@ -624 +625 @@
         visitor.appendUnbarrieredValue(&mustHandleValues[i]);
 
-    visitor.appendUnbarrieredReadOnlyPointer(codeBlock);
-    visitor.appendUnbarrieredReadOnlyPointer(profiledDFGCodeBlock);
+    codeBlock->visitStrongly(visitor);
+    codeBlock->alternative()->visitStrongly(visitor);
+    if (profiledDFGCodeBlock)
+        profiledDFGCodeBlock->visitStrongly(visitor);
 
     if (inlineCallFrames) {
         for (auto* inlineCallFrame : *inlineCallFrames) {
-            ASSERT(inlineCallFrame->baselineCodeBlock.get());
-            visitor.appendUnbarrieredReadOnlyPointer(inlineCallFrame->baselineCodeBlock.get());
+            ASSERT(inlineCallFrame->baselineCodeBlock());
+            inlineCallFrame->baselineCodeBlock()->visitStrongly(visitor);
         }
     }