Changeset 179392 in webkit for trunk/Source/JavaScriptCore/bytecode/CallLinkInfo.cpp

Timestamp:

Jan 29, 2015, 8:28:36 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r179357 and r179358.
​https://bugs.webkit.org/show_bug.cgi?id=141062

Suspect this caused WebGL tests to start flaking (Requested by
kling on #webkit).

Reverted changesets:

"Polymorphic call inlining should be based on polymorphic call
inline caching rather than logging"
​https://bugs.webkit.org/show_bug.cgi?id=140660
​http://trac.webkit.org/changeset/179357

"Unreviewed, fix no-JIT build."
​http://trac.webkit.org/changeset/179358

Patch by Commit Queue <​[email protected]> on 2015-01-29

File:

• trunk/Source/JavaScriptCore/bytecode/CallLinkInfo.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/bytecode/CallLinkInfo.cpp

@@ -30 +30 @@
 #include "DFGThunks.h"
 #include "JSCInlines.h"
-#include "Repatch.h"
 #include "RepatchBuffer.h"
-#include <wtf/ListDump.h>
 #include <wtf/NeverDestroyed.h>
 
@@ -40 +38 @@
 void CallLinkInfo::unlink(RepatchBuffer& repatchBuffer)
 {
-    if (!isLinked()) {
-        // We could be called even if we're not linked anymore because of how polymorphic calls
-        // work. Each callsite within the polymorphic call stub may separately ask us to unlink().
-        RELEASE_ASSERT(!isOnList());
-        return;
-    }
+    ASSERT(isLinked());
     
-    unlinkFor(
-        repatchBuffer, *this,
-        (callType == Construct || callType == ConstructVarargs)? CodeForConstruct : CodeForCall,
-        isFTL ? MustPreserveRegisters : RegisterPreservationNotRequired);
+    if (Options::showDisassembly())
+        dataLog("Unlinking call from ", callReturnLocation, " to ", pointerDump(repatchBuffer.codeBlock()), "\n");
+
+    repatchBuffer.revertJumpReplacementToBranchPtrWithPatch(RepatchBuffer::startOfBranchPtrWithPatchOnRegister(hotPathBegin), static_cast<MacroAssembler::RegisterID>(calleeGPR), 0);
+    repatchBuffer.relink(
+        callReturnLocation,
+        repatchBuffer.codeBlock()->vm()->getCTIStub(linkThunkGeneratorFor(
+            (callType == Construct || callType == ConstructVarargs)? CodeForConstruct : CodeForCall,
+            isFTL ? MustPreserveRegisters : RegisterPreservationNotRequired)).code());
+    hasSeenShouldRepatch = false;
+    callee.clear();
+    stub.clear();
 
     // It will be on a list if the callee has a code block.
@@ -61 +62 @@
     if (isLinked()) {
         if (stub) {
-            if (!stub->visitWeak(repatchBuffer)) {
+            if (!Heap::isMarked(stub->executable())) {
                 if (Options::verboseOSR()) {
                     dataLog(
                         "Clearing closure call from ", *repatchBuffer.codeBlock(), " to ",
-                        listDump(stub->variants()), ", stub routine ", RawPointer(stub.get()),
-                        ".\n");
+                        stub->executable()->hashFor(specializationKind()),
+                        ", stub routine ", RawPointer(stub.get()), ".\n");
                 }
                 unlink(repatchBuffer);
@@ -83 +84 @@
     if (!!lastSeenCallee && !Heap::isMarked(lastSeenCallee.get()))
         lastSeenCallee.clear();
+    
+    if (callEdgeProfile) {
+        WTF::loadLoadFence();
+        callEdgeProfile->visitWeak();
+    }
 }