Changeset 80738 in webkit for trunk/Source/JavaScriptCore/jit/JIT.cpp

Timestamp:

Mar 10, 2011, 11:27:49 AM (14 years ago)

Author:

[email protected]

Message:

2011-03-10 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

jquery/manipulation.html fails after r80598
​https://bugs.webkit.org/show_bug.cgi?id=56019

Removed jQuery tests from skiplists

• platform/gtk/Skipped:
• platform/qt/Skipped:

2011-03-09 Oliver Hunt <​[email protected]>

Reviewed by Gavin Barraclough.

jquery/manipulation.html fails after r80598
​https://bugs.webkit.org/show_bug.cgi?id=56019

When linking a call, codeblock now takes ownership of the linked function
This removes the need for unlinking, and thus the incorrectness that was
showing up in these tests.

• bytecode/CodeBlock.cpp: (JSC::CodeBlock::~CodeBlock): (JSC::CodeBlock::markAggregate):
• bytecode/CodeBlock.h: (JSC::CallLinkInfo::CallLinkInfo): (JSC::CallLinkInfo::setUnlinked): (JSC::CodeBlock::addCaller):
• jit/JIT.cpp: (JSC::JIT::privateCompile): (JSC::JIT::linkCall): (JSC::JIT::linkConstruct):
• jit/JIT.h:
• runtime/Executable.cpp:
• runtime/Executable.h:

File:

• trunk/Source/JavaScriptCore/jit/JIT.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/jit/JIT.cpp

@@ -568 +568 @@
     for (unsigned i = 0; i < m_codeBlock->numberOfCallLinkInfos(); ++i) {
         CallLinkInfo& info = m_codeBlock->callLinkInfo(i);
-        info.ownerCodeBlock = m_codeBlock;
         info.callReturnLocation = patchBuffer.locationOfNearCall(m_callStructureStubCompilationInfo[i].callReturnLocation);
         info.hotPathBegin = patchBuffer.locationOf(m_callStructureStubCompilationInfo[i].hotPathBegin);
@@ -589 +588 @@
 
 #if ENABLE(JIT_OPTIMIZE_CALL)
-void JIT::unlinkCallOrConstruct(CallLinkInfo* callLinkInfo)
-{
-    // When the JSFunction is deleted the pointer embedded in the instruction stream will no longer be valid
-    // (and, if a new JSFunction happened to be constructed at the same location, we could get a false positive
-    // match).  Reset the check so it no longer matches.
-    RepatchBuffer repatchBuffer(callLinkInfo->ownerCodeBlock);
-#if USE(JSVALUE32_64)
-    repatchBuffer.repatch(callLinkInfo->hotPathBegin, 0);
-#else
-    repatchBuffer.repatch(callLinkInfo->hotPathBegin, JSValue::encode(JSValue()));
-#endif
-}
 
 void JIT::linkCall(JSFunction* callee, CodeBlock* callerCodeBlock, CodeBlock* calleeCodeBlock, JIT::CodePtr code, CallLinkInfo* callLinkInfo, int callerArgCount, JSGlobalData* globalData)
@@ -612 +599 @@
     
         if (calleeCodeBlock)
-            calleeCodeBlock->addCaller(callLinkInfo);
+            calleeCodeBlock->addCaller(*globalData, callLinkInfo, callee);
     
         repatchBuffer.repatch(callLinkInfo->hotPathBegin, callee);
@@ -632 +619 @@
     
         if (calleeCodeBlock)
-            calleeCodeBlock->addCaller(callLinkInfo);
+            calleeCodeBlock->addCaller(*globalData, callLinkInfo, callee);
     
         repatchBuffer.repatch(callLinkInfo->hotPathBegin, callee);