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

Timestamp:

Sep 22, 2013, 10:03:59 AM (12 years ago)

Author:

[email protected]

Message:

Get rid of CodeBlock::RareData::callReturnIndexVector and most of the evil that it introduced
​https://bugs.webkit.org/show_bug.cgi?id=121766

Reviewed by Andreas Kling.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::shrinkToFit):

• bytecode/CodeBlock.h:
• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::compileExceptionHandlers):
(JSC::DFG::JITCompiler::link):

• jit/JIT.cpp:

(JSC::JIT::privateCompile):

File:

• trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.h

@@ -200 +200 @@
 #endif // ENABLE(JIT)
 
-    unsigned bytecodeOffset(ExecState*, ReturnAddressPtr);
-
     void unlinkIncomingCalls();
 
 #if ENABLE(JIT)
-    unsigned bytecodeOffsetForCallAtIndex(unsigned index)
-    {
-        if (!m_rareData)
-            return 1;
-        Vector<CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow>& callIndices = m_rareData->m_callReturnIndexVector;
-        if (!callIndices.size())
-            return 1;
-        // FIXME: Fix places in DFG that call out to C that don't set the CodeOrigin. https://bugs.webkit.org/show_bug.cgi?id=118315
-        ASSERT(index < m_rareData->m_callReturnIndexVector.size());
-        if (index >= m_rareData->m_callReturnIndexVector.size())
-            return 1;
-        return m_rareData->m_callReturnIndexVector[index].bytecodeOffset;
-    }
-
     void unlinkCalls();
         
@@ -581 +565 @@
 
     bool hasExpressionInfo() { return m_unlinkedCode->hasExpressionInfo(); }
-
-#if ENABLE(JIT)
-    Vector<CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow>& callReturnIndexVector()
-    {
-        createRareDataIfNecessary();
-        return m_rareData->m_callReturnIndexVector;
-    }
-#endif
 
 #if ENABLE(DFG_JIT)
@@ -1146 +1122 @@
         EvalCodeCache m_evalCodeCache;
 
-#if ENABLE(JIT)
-        Vector<CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow> m_callReturnIndexVector;
-#endif
 #if ENABLE(DFG_JIT)
         SegmentedVector<InlineCallFrame, 4> m_inlineCallFrames;