Changeset 80738 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

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/bytecode/CodeBlock.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -97 +97 @@
     struct CallLinkInfo {
         CallLinkInfo()
-            : callee(0)
-            , position(0)
+            : position(0)
             , hasSeenShouldRepatch(0)
         {
@@ -106 +105 @@
         CodeLocationDataLabelPtr hotPathBegin;
         CodeLocationNearCall hotPathOther;
-        CodeBlock* ownerCodeBlock;
-        CodeBlock* callee;
+        WriteBarrier<JSFunction> callee;
         unsigned position : 31;
         unsigned hasSeenShouldRepatch : 1;
         
-        void setUnlinked() { callee = 0; }
+        void setUnlinked() { callee.clear(); }
         bool isLinked() { return callee; }
 
@@ -258 +256 @@
         void refStructures(Instruction* vPC) const;
         void derefStructures(Instruction* vPC) const;
-#if ENABLE(JIT_OPTIMIZE_CALL)
-        void unlinkCallers();
-#endif
 
         static void dumpStatistics();
@@ -293 +288 @@
 
 #if ENABLE(JIT)
-        void addCaller(CallLinkInfo* caller)
-        {
-            caller->callee = this;
+        void addCaller(JSGlobalData& globalData, CallLinkInfo* caller, JSFunction* callee)
+        {
+            caller->callee.set(globalData, ownerExecutable(), callee);
             caller->position = m_linkedCallerList.size();
             m_linkedCallerList.append(caller);
-        }
-
-        void removeCaller(CallLinkInfo* caller)
-        {
-            unsigned pos = caller->position;
-            unsigned lastPos = m_linkedCallerList.size() - 1;
-
-            if (pos != lastPos) {
-                m_linkedCallerList[pos] = m_linkedCallerList[lastPos];
-                m_linkedCallerList[pos]->position = pos;
-            }
-            m_linkedCallerList.shrink(lastPos);
         }