Changeset 190546 in webkit for trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.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/llint/LLIntSlowPaths.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -577 +577 @@
             && !structure->typeInfo().prohibitsPropertyCaching()
             && !structure->typeInfo().newImpurePropertyFiresWatchpoints()) {
-            vm.heap.writeBarrier(codeBlock);
+            vm.heap.writeBarrier(codeBlock->ownerExecutable());
             
             ConcurrentJITLocker locker(codeBlock->m_lock);
@@ -642 +642 @@
             && baseCell == slot.base()) {
 
-            vm.heap.writeBarrier(codeBlock);
+            vm.heap.writeBarrier(codeBlock->ownerExecutable());
             
             if (slot.type() == PutPropertySlot::NewProperty) {
@@ -659 +659 @@
                             ASSERT(chain);
                             pc[7].u.structureChain.set(
-                                vm, codeBlock, chain);
+                                vm, codeBlock->ownerExecutable(), chain);
                         }
                         pc[8].u.putByIdFlags = static_cast<PutByIdFlags>(
@@ -1191 +1191 @@
         if (callLinkInfo->isOnList())
             callLinkInfo->remove();
-        callLinkInfo->callee.set(vm, callerCodeBlock, callee);
-        callLinkInfo->lastSeenCallee.set(vm, callerCodeBlock, callee);
+        callLinkInfo->callee.set(vm, callerCodeBlock->ownerExecutable(), callee);
+        callLinkInfo->lastSeenCallee.set(vm, callerCodeBlock->ownerExecutable(), callee);
         callLinkInfo->machineCodeTarget = codePtr;
         if (codeBlock)