<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[150567] branches/dfgFourthTier/Source/JavaScriptCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/150567">150567</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2013-05-22 22:00:40 -0700 (Wed, 22 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix indentation of CodeBlock.h

Rubber stamped by Mark Hahnenberg.

* bytecode/CodeBlock.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCoreChangeLog">branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesdfgFourthTierSourceJavaScriptCorebytecodeCodeBlockh">branches/dfgFourthTier/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesdfgFourthTierSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog (150566 => 150567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog        2013-05-23 05:00:01 UTC (rev 150566)
+++ branches/dfgFourthTier/Source/JavaScriptCore/ChangeLog        2013-05-23 05:00:40 UTC (rev 150567)
</span><span class="lines">@@ -1,5 +1,13 @@
</span><span class="cx"> 2013-05-22  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Fix indentation of CodeBlock.h
+
+        Rubber stamped by Mark Hahnenberg.
+
+        * bytecode/CodeBlock.h:
+
+2013-05-22  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
</ins><span class="cx">         Rename getJITCode and getJITType to jitCode and jitType.
</span><span class="cx">         
</span><span class="cx">         Rubber stampted by Mark Hahnenberg.
</span></span></pre></div>
<a id="branchesdfgFourthTierSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: branches/dfgFourthTier/Source/JavaScriptCore/bytecode/CodeBlock.h (150566 => 150567)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dfgFourthTier/Source/JavaScriptCore/bytecode/CodeBlock.h        2013-05-23 05:00:01 UTC (rev 150566)
+++ branches/dfgFourthTier/Source/JavaScriptCore/bytecode/CodeBlock.h        2013-05-23 05:00:40 UTC (rev 150567)
</span><span class="lines">@@ -81,1203 +81,1203 @@
</span><span class="cx"> 
</span><span class="cx"> namespace JSC {
</span><span class="cx"> 
</span><del>-    class DFGCodeBlocks;
-    class ExecState;
-    class LLIntOffsetsExtractor;
-    class RepatchBuffer;
</del><ins>+class DFGCodeBlocks;
+class ExecState;
+class LLIntOffsetsExtractor;
+class RepatchBuffer;
</ins><span class="cx"> 
</span><del>-    inline int unmodifiedArgumentsRegister(int argumentsRegister) { return argumentsRegister - 1; }
</del><ins>+inline int unmodifiedArgumentsRegister(int argumentsRegister) { return argumentsRegister - 1; }
</ins><span class="cx"> 
</span><del>-    static ALWAYS_INLINE int missingThisObjectMarker() { return std::numeric_limits&lt;int&gt;::max(); }
</del><ins>+static ALWAYS_INLINE int missingThisObjectMarker() { return std::numeric_limits&lt;int&gt;::max(); }
</ins><span class="cx"> 
</span><span class="cx"> class CodeBlock : public ThreadSafeRefCounted&lt;CodeBlock&gt;, public UnconditionalFinalizer, public WeakReferenceHarvester {
</span><del>-        WTF_MAKE_FAST_ALLOCATED;
-        friend class JIT;
-        friend class LLIntOffsetsExtractor;
-    public:
-        enum CopyParsedBlockTag { CopyParsedBlock };
-    protected:
-        CodeBlock(CopyParsedBlockTag, CodeBlock&amp; other);
</del><ins>+    WTF_MAKE_FAST_ALLOCATED;
+    friend class JIT;
+    friend class LLIntOffsetsExtractor;
+public:
+    enum CopyParsedBlockTag { CopyParsedBlock };
+protected:
+    CodeBlock(CopyParsedBlockTag, CodeBlock&amp; other);
</ins><span class="cx">         
</span><del>-        CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock*, JSGlobalObject*, unsigned baseScopeDepth, PassRefPtr&lt;SourceProvider&gt;, unsigned sourceOffset);
</del><ins>+    CodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock*, JSGlobalObject*, unsigned baseScopeDepth, PassRefPtr&lt;SourceProvider&gt;, unsigned sourceOffset);
</ins><span class="cx"> 
</span><del>-        WriteBarrier&lt;JSGlobalObject&gt; m_globalObject;
-        Heap* m_heap;
</del><ins>+    WriteBarrier&lt;JSGlobalObject&gt; m_globalObject;
+    Heap* m_heap;
</ins><span class="cx"> 
</span><del>-    public:
-        JS_EXPORT_PRIVATE virtual ~CodeBlock();
</del><ins>+public:
+    JS_EXPORT_PRIVATE virtual ~CodeBlock();
</ins><span class="cx">         
</span><del>-        UnlinkedCodeBlock* unlinkedCodeBlock() const { return m_unlinkedCode.get(); }
</del><ins>+    UnlinkedCodeBlock* unlinkedCodeBlock() const { return m_unlinkedCode.get(); }
</ins><span class="cx">         
</span><del>-        CString inferredName() const;
-        CodeBlockHash hash() const;
-        CString sourceCodeForTools() const; // Not quite the actual source we parsed; this will do things like prefix the source for a function with a reified signature.
-        CString sourceCodeOnOneLine() const; // As sourceCodeForTools(), but replaces all whitespace runs with a single space.
-        void dumpAssumingJITType(PrintStream&amp;, JITCode::JITType) const;
-        void dump(PrintStream&amp;) const;
</del><ins>+    CString inferredName() const;
+    CodeBlockHash hash() const;
+    CString sourceCodeForTools() const; // Not quite the actual source we parsed; this will do things like prefix the source for a function with a reified signature.
+    CString sourceCodeOnOneLine() const; // As sourceCodeForTools(), but replaces all whitespace runs with a single space.
+    void dumpAssumingJITType(PrintStream&amp;, JITCode::JITType) const;
+    void dump(PrintStream&amp;) const;
</ins><span class="cx">         
</span><del>-        int numParameters() const { return m_numParameters; }
-        void setNumParameters(int newValue);
</del><ins>+    int numParameters() const { return m_numParameters; }
+    void setNumParameters(int newValue);
</ins><span class="cx">         
</span><del>-        int* addressOfNumParameters() { return &amp;m_numParameters; }
-        static ptrdiff_t offsetOfNumParameters() { return OBJECT_OFFSETOF(CodeBlock, m_numParameters); }
</del><ins>+    int* addressOfNumParameters() { return &amp;m_numParameters; }
+    static ptrdiff_t offsetOfNumParameters() { return OBJECT_OFFSETOF(CodeBlock, m_numParameters); }
</ins><span class="cx"> 
</span><del>-        CodeBlock* alternative() { return m_alternative.get(); }
-        PassRefPtr&lt;CodeBlock&gt; releaseAlternative() { return m_alternative.release(); }
-        void setAlternative(PassRefPtr&lt;CodeBlock&gt; alternative) { m_alternative = alternative; }
</del><ins>+    CodeBlock* alternative() { return m_alternative.get(); }
+    PassRefPtr&lt;CodeBlock&gt; releaseAlternative() { return m_alternative.release(); }
+    void setAlternative(PassRefPtr&lt;CodeBlock&gt; alternative) { m_alternative = alternative; }
</ins><span class="cx">         
</span><del>-        CodeSpecializationKind specializationKind() const
-        {
-            return specializationFromIsConstruct(m_isConstructor);
-        }
</del><ins>+    CodeSpecializationKind specializationKind() const
+    {
+        return specializationFromIsConstruct(m_isConstructor);
+    }
</ins><span class="cx">         
</span><del>-        CodeBlock* baselineVersion();
</del><ins>+    CodeBlock* baselineVersion();
</ins><span class="cx"> 
</span><del>-        void visitAggregate(SlotVisitor&amp;);
</del><ins>+    void visitAggregate(SlotVisitor&amp;);
</ins><span class="cx"> 
</span><del>-        static void dumpStatistics();
</del><ins>+    static void dumpStatistics();
</ins><span class="cx"> 
</span><del>-        void dumpBytecode(PrintStream&amp; = WTF::dataFile());
-        void dumpBytecode(PrintStream&amp;, unsigned bytecodeOffset);
-        void printStructures(PrintStream&amp;, const Instruction*);
-        void printStructure(PrintStream&amp;, const char* name, const Instruction*, int operand);
</del><ins>+    void dumpBytecode(PrintStream&amp; = WTF::dataFile());
+    void dumpBytecode(PrintStream&amp;, unsigned bytecodeOffset);
+    void printStructures(PrintStream&amp;, const Instruction*);
+    void printStructure(PrintStream&amp;, const char* name, const Instruction*, int operand);
</ins><span class="cx"> 
</span><del>-        bool isStrictMode() const { return m_isStrictMode; }
</del><ins>+    bool isStrictMode() const { return m_isStrictMode; }
</ins><span class="cx"> 
</span><del>-        inline bool isKnownNotImmediate(int index)
-        {
-            if (index == m_thisRegister &amp;&amp; !m_isStrictMode)
-                return true;
</del><ins>+    inline bool isKnownNotImmediate(int index)
+    {
+        if (index == m_thisRegister &amp;&amp; !m_isStrictMode)
+            return true;
</ins><span class="cx"> 
</span><del>-            if (isConstantRegisterIndex(index))
-                return getConstant(index).isCell();
</del><ins>+        if (isConstantRegisterIndex(index))
+            return getConstant(index).isCell();
</ins><span class="cx"> 
</span><del>-            return false;
-        }
</del><ins>+        return false;
+    }
</ins><span class="cx"> 
</span><del>-        ALWAYS_INLINE bool isTemporaryRegisterIndex(int index)
-        {
-            return index &gt;= m_numVars;
-        }
</del><ins>+    ALWAYS_INLINE bool isTemporaryRegisterIndex(int index)
+    {
+        return index &gt;= m_numVars;
+    }
</ins><span class="cx"> 
</span><del>-        HandlerInfo* handlerForBytecodeOffset(unsigned bytecodeOffset);
-        int lineNumberForBytecodeOffset(unsigned bytecodeOffset);
-        void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int&amp; divot, int&amp; startOffset, int&amp; endOffset);
</del><ins>+    HandlerInfo* handlerForBytecodeOffset(unsigned bytecodeOffset);
+    int lineNumberForBytecodeOffset(unsigned bytecodeOffset);
+    void expressionRangeForBytecodeOffset(unsigned bytecodeOffset, int&amp; divot, int&amp; startOffset, int&amp; endOffset);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> 
</span><del>-        StructureStubInfo&amp; getStubInfo(ReturnAddressPtr returnAddress)
-        {
-            return *(binarySearch&lt;StructureStubInfo, void*&gt;(m_structureStubInfos, m_structureStubInfos.size(), returnAddress.value(), getStructureStubInfoReturnLocation));
-        }
</del><ins>+    StructureStubInfo&amp; getStubInfo(ReturnAddressPtr returnAddress)
+    {
+        return *(binarySearch&lt;StructureStubInfo, void*&gt;(m_structureStubInfos, m_structureStubInfos.size(), returnAddress.value(), getStructureStubInfoReturnLocation));
+    }
</ins><span class="cx"> 
</span><del>-        StructureStubInfo&amp; getStubInfo(unsigned bytecodeIndex)
-        {
-            return *(binarySearch&lt;StructureStubInfo, unsigned&gt;(m_structureStubInfos, m_structureStubInfos.size(), bytecodeIndex, getStructureStubInfoBytecodeIndex));
-        }
</del><ins>+    StructureStubInfo&amp; getStubInfo(unsigned bytecodeIndex)
+    {
+        return *(binarySearch&lt;StructureStubInfo, unsigned&gt;(m_structureStubInfos, m_structureStubInfos.size(), bytecodeIndex, getStructureStubInfoBytecodeIndex));
+    }
</ins><span class="cx">         
</span><del>-        void resetStub(StructureStubInfo&amp;);
</del><ins>+    void resetStub(StructureStubInfo&amp;);
</ins><span class="cx">         
</span><del>-        ByValInfo&amp; getByValInfo(unsigned bytecodeIndex)
-        {
-            return *(binarySearch&lt;ByValInfo, unsigned&gt;(m_byValInfos, m_byValInfos.size(), bytecodeIndex, getByValInfoBytecodeIndex));
-        }
</del><ins>+    ByValInfo&amp; getByValInfo(unsigned bytecodeIndex)
+    {
+        return *(binarySearch&lt;ByValInfo, unsigned&gt;(m_byValInfos, m_byValInfos.size(), bytecodeIndex, getByValInfoBytecodeIndex));
+    }
</ins><span class="cx"> 
</span><del>-        CallLinkInfo&amp; getCallLinkInfo(ReturnAddressPtr returnAddress)
-        {
-            return *(binarySearch&lt;CallLinkInfo, void*&gt;(m_callLinkInfos, m_callLinkInfos.size(), returnAddress.value(), getCallLinkInfoReturnLocation));
-        }
</del><ins>+    CallLinkInfo&amp; getCallLinkInfo(ReturnAddressPtr returnAddress)
+    {
+        return *(binarySearch&lt;CallLinkInfo, void*&gt;(m_callLinkInfos, m_callLinkInfos.size(), returnAddress.value(), getCallLinkInfoReturnLocation));
+    }
</ins><span class="cx">         
</span><del>-        CallLinkInfo&amp; getCallLinkInfo(unsigned bytecodeIndex)
-        {
-            ASSERT(JITCode::isBaselineCode(jitType()));
-            return *(binarySearch&lt;CallLinkInfo, unsigned&gt;(m_callLinkInfos, m_callLinkInfos.size(), bytecodeIndex, getCallLinkInfoBytecodeIndex));
-        }
</del><ins>+    CallLinkInfo&amp; getCallLinkInfo(unsigned bytecodeIndex)
+    {
+        ASSERT(JITCode::isBaselineCode(jitType()));
+        return *(binarySearch&lt;CallLinkInfo, unsigned&gt;(m_callLinkInfos, m_callLinkInfos.size(), bytecodeIndex, getCallLinkInfoBytecodeIndex));
+    }
</ins><span class="cx"> #endif // ENABLE(JIT)
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LLINT)
</span><del>-        Instruction* adjustPCIfAtCallSite(Instruction*);
</del><ins>+    Instruction* adjustPCIfAtCallSite(Instruction*);
</ins><span class="cx"> #endif
</span><del>-        unsigned bytecodeOffset(ExecState*, ReturnAddressPtr);
</del><ins>+    unsigned bytecodeOffset(ExecState*, ReturnAddressPtr);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-        unsigned bytecodeOffsetForCallAtIndex(unsigned index)
-        {
-            if (!m_rareData)
-                return 1;
-            Vector&lt;CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow&gt;&amp; callIndices = m_rareData-&gt;m_callReturnIndexVector;
-            if (!callIndices.size())
-                return 1;
-            RELEASE_ASSERT(index &lt; m_rareData-&gt;m_callReturnIndexVector.size());
-            return m_rareData-&gt;m_callReturnIndexVector[index].bytecodeOffset;
-        }
</del><ins>+    unsigned bytecodeOffsetForCallAtIndex(unsigned index)
+    {
+        if (!m_rareData)
+            return 1;
+        Vector&lt;CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow&gt;&amp; callIndices = m_rareData-&gt;m_callReturnIndexVector;
+        if (!callIndices.size())
+            return 1;
+        RELEASE_ASSERT(index &lt; m_rareData-&gt;m_callReturnIndexVector.size());
+        return m_rareData-&gt;m_callReturnIndexVector[index].bytecodeOffset;
+    }
</ins><span class="cx"> 
</span><del>-        void unlinkCalls();
</del><ins>+    void unlinkCalls();
</ins><span class="cx">         
</span><del>-        bool hasIncomingCalls() { return m_incomingCalls.begin() != m_incomingCalls.end(); }
</del><ins>+    bool hasIncomingCalls() { return m_incomingCalls.begin() != m_incomingCalls.end(); }
</ins><span class="cx">         
</span><del>-        void linkIncomingCall(CallLinkInfo* incoming)
-        {
-            m_incomingCalls.push(incoming);
-        }
</del><ins>+    void linkIncomingCall(CallLinkInfo* incoming)
+    {
+        m_incomingCalls.push(incoming);
+    }
</ins><span class="cx">         
</span><del>-        bool isIncomingCallAlreadyLinked(CallLinkInfo* incoming)
-        {
-            return m_incomingCalls.isOnList(incoming);
-        }
</del><ins>+    bool isIncomingCallAlreadyLinked(CallLinkInfo* incoming)
+    {
+        return m_incomingCalls.isOnList(incoming);
+    }
</ins><span class="cx"> #endif // ENABLE(JIT)
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(LLINT)
</span><del>-        void linkIncomingCall(LLIntCallLinkInfo* incoming)
-        {
-            m_incomingLLIntCalls.push(incoming);
-        }
</del><ins>+    void linkIncomingCall(LLIntCallLinkInfo* incoming)
+    {
+        m_incomingLLIntCalls.push(incoming);
+    }
</ins><span class="cx"> #endif // ENABLE(LLINT)
</span><span class="cx">         
</span><del>-        void unlinkIncomingCalls();
</del><ins>+    void unlinkIncomingCalls();
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(DFG_JIT) || ENABLE(LLINT)
</span><del>-        void setJITCodeMap(PassOwnPtr&lt;CompactJITCodeMap&gt; jitCodeMap)
-        {
-            m_jitCodeMap = jitCodeMap;
-        }
-        CompactJITCodeMap* jitCodeMap()
-        {
-            return m_jitCodeMap.get();
-        }
</del><ins>+    void setJITCodeMap(PassOwnPtr&lt;CompactJITCodeMap&gt; jitCodeMap)
+    {
+        m_jitCodeMap = jitCodeMap;
+    }
+    CompactJITCodeMap* jitCodeMap()
+    {
+        return m_jitCodeMap.get();
+    }
</ins><span class="cx"> #endif
</span><span class="cx">         
</span><del>-        unsigned bytecodeOffset(Instruction* returnAddress)
-        {
-            RELEASE_ASSERT(returnAddress &gt;= instructions().begin() &amp;&amp; returnAddress &lt; instructions().end());
-            return static_cast&lt;Instruction*&gt;(returnAddress) - instructions().begin();
-        }
</del><ins>+    unsigned bytecodeOffset(Instruction* returnAddress)
+    {
+        RELEASE_ASSERT(returnAddress &gt;= instructions().begin() &amp;&amp; returnAddress &lt; instructions().end());
+        return static_cast&lt;Instruction*&gt;(returnAddress) - instructions().begin();
+    }
</ins><span class="cx"> 
</span><del>-        bool isNumericCompareFunction() { return m_unlinkedCode-&gt;isNumericCompareFunction(); }
</del><ins>+    bool isNumericCompareFunction() { return m_unlinkedCode-&gt;isNumericCompareFunction(); }
</ins><span class="cx"> 
</span><del>-        unsigned numberOfInstructions() const { return m_instructions.size(); }
-        RefCountedArray&lt;Instruction&gt;&amp; instructions() { return m_instructions; }
-        const RefCountedArray&lt;Instruction&gt;&amp; instructions() const { return m_instructions; }
</del><ins>+    unsigned numberOfInstructions() const { return m_instructions.size(); }
+    RefCountedArray&lt;Instruction&gt;&amp; instructions() { return m_instructions; }
+    const RefCountedArray&lt;Instruction&gt;&amp; instructions() const { return m_instructions; }
</ins><span class="cx">         
</span><del>-        size_t predictedMachineCodeSize();
</del><ins>+    size_t predictedMachineCodeSize();
</ins><span class="cx">         
</span><del>-        bool usesOpcode(OpcodeID);
</del><ins>+    bool usesOpcode(OpcodeID);
</ins><span class="cx"> 
</span><del>-        unsigned instructionCount() { return m_instructions.size(); }
</del><ins>+    unsigned instructionCount() { return m_instructions.size(); }
</ins><span class="cx"> 
</span><del>-        int argumentIndexAfterCapture(size_t argument);
</del><ins>+    int argumentIndexAfterCapture(size_t argument);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-        void setJITCode(PassRefPtr&lt;JITCode&gt; code, MacroAssemblerCodePtr codeWithArityCheck)
-        {
-            ConcurrentJITLocker locker(m_lock);
-            WTF::storeStoreFence(); // This is probably not needed because the lock will also do something similar, but it's good to be paranoid.
-            m_jitCode = code;
-            m_jitCodeWithArityCheck = codeWithArityCheck;
</del><ins>+    void setJITCode(PassRefPtr&lt;JITCode&gt; code, MacroAssemblerCodePtr codeWithArityCheck)
+    {
+        ConcurrentJITLocker locker(m_lock);
+        WTF::storeStoreFence(); // This is probably not needed because the lock will also do something similar, but it's good to be paranoid.
+        m_jitCode = code;
+        m_jitCodeWithArityCheck = codeWithArityCheck;
</ins><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-            if (JITCode::isOptimizingJIT(JITCode::jitTypeFor(m_jitCode)))
-                m_vm-&gt;heap.m_dfgCodeBlocks.m_set.add(this);
</del><ins>+        if (JITCode::isOptimizingJIT(JITCode::jitTypeFor(m_jitCode)))
+            m_vm-&gt;heap.m_dfgCodeBlocks.m_set.add(this);
</ins><span class="cx"> #endif
</span><ins>+    }
+    PassRefPtr&lt;JITCode&gt; jitCode() { return m_jitCode; }
+    MacroAssemblerCodePtr jitCodeWithArityCheck() { return m_jitCodeWithArityCheck; }
+    JITCode::JITType jitType() const
+    {
+        JITCode* jitCode = m_jitCode.get();
+        WTF::loadLoadFence();
+        JITCode::JITType result = JITCode::jitTypeFor(jitCode);
+        WTF::loadLoadFence(); // This probably isn't needed. Oh well, paranoia is good.
+        return result;
+    }
+    bool hasBaselineJITProfiling() const
+    {
+        return jitType() == JITCode::BaselineJIT;
+    }
+    virtual JSObject* compileOptimized(ExecState*, JSScope*, CompilationResult&amp;, unsigned bytecodeIndex) = 0;
+    virtual CompilationResult replaceWithDeferredOptimizedCode(PassRefPtr&lt;DFG::Plan&gt;) = 0;
+    virtual void jettison() = 0;
+    CompilationResult jitCompile(ExecState* exec)
+    {
+        if (jitType() != JITCode::InterpreterThunk) {
+            ASSERT(jitType() == JITCode::BaselineJIT);
+            return CompilationNotNeeded;
</ins><span class="cx">         }
</span><del>-        PassRefPtr&lt;JITCode&gt; jitCode() { return m_jitCode; }
-        MacroAssemblerCodePtr jitCodeWithArityCheck() { return m_jitCodeWithArityCheck; }
-        JITCode::JITType jitType() const
-        {
-            JITCode* jitCode = m_jitCode.get();
-            WTF::loadLoadFence();
-            JITCode::JITType result = JITCode::jitTypeFor(jitCode);
-            WTF::loadLoadFence(); // This probably isn't needed. Oh well, paranoia is good.
-            return result;
-        }
-        bool hasBaselineJITProfiling() const
-        {
-            return jitType() == JITCode::BaselineJIT;
-        }
-        virtual JSObject* compileOptimized(ExecState*, JSScope*, CompilationResult&amp;, unsigned bytecodeIndex) = 0;
-        virtual CompilationResult replaceWithDeferredOptimizedCode(PassRefPtr&lt;DFG::Plan&gt;) = 0;
-        virtual void jettison() = 0;
-        CompilationResult jitCompile(ExecState* exec)
-        {
-            if (jitType() != JITCode::InterpreterThunk) {
-                ASSERT(jitType() == JITCode::BaselineJIT);
-                return CompilationNotNeeded;
-            }
-            return jitCompileImpl(exec);
-        }
-        virtual CodeBlock* replacement() = 0;
</del><ins>+        return jitCompileImpl(exec);
+    }
+    virtual CodeBlock* replacement() = 0;
</ins><span class="cx"> 
</span><del>-        virtual DFG::CapabilityLevel canCompileWithDFGInternal() = 0;
-        DFG::CapabilityLevel canCompileWithDFG()
-        {
-            DFG::CapabilityLevel result = canCompileWithDFGInternal();
-            m_canCompileWithDFGState = result;
-            return result;
-        }
-        DFG::CapabilityLevel canCompileWithDFGState() { return m_canCompileWithDFGState; }
</del><ins>+    virtual DFG::CapabilityLevel canCompileWithDFGInternal() = 0;
+    DFG::CapabilityLevel canCompileWithDFG()
+    {
+        DFG::CapabilityLevel result = canCompileWithDFGInternal();
+        m_canCompileWithDFGState = result;
+        return result;
+    }
+    DFG::CapabilityLevel canCompileWithDFGState() { return m_canCompileWithDFGState; }
</ins><span class="cx"> 
</span><del>-        bool hasOptimizedReplacement();
</del><ins>+    bool hasOptimizedReplacement();
</ins><span class="cx"> #else
</span><del>-        JITCode::JITType jitType() const { return JITCode::BaselineJIT; }
</del><ins>+    JITCode::JITType jitType() const { return JITCode::BaselineJIT; }
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        ScriptExecutable* ownerExecutable() const { return m_ownerExecutable.get(); }
</del><ins>+    ScriptExecutable* ownerExecutable() const { return m_ownerExecutable.get(); }
</ins><span class="cx"> 
</span><del>-        void setVM(VM* vm) { m_vm = vm; }
-        VM* vm() { return m_vm; }
</del><ins>+    void setVM(VM* vm) { m_vm = vm; }
+    VM* vm() { return m_vm; }
</ins><span class="cx"> 
</span><del>-        void setThisRegister(int thisRegister) { m_thisRegister = thisRegister; }
-        int thisRegister() const { return m_thisRegister; }
</del><ins>+    void setThisRegister(int thisRegister) { m_thisRegister = thisRegister; }
+    int thisRegister() const { return m_thisRegister; }
</ins><span class="cx"> 
</span><del>-        bool needsFullScopeChain() const { return m_unlinkedCode-&gt;needsFullScopeChain(); }
-        bool usesEval() const { return m_unlinkedCode-&gt;usesEval(); }
</del><ins>+    bool needsFullScopeChain() const { return m_unlinkedCode-&gt;needsFullScopeChain(); }
+    bool usesEval() const { return m_unlinkedCode-&gt;usesEval(); }
</ins><span class="cx">         
</span><del>-        void setArgumentsRegister(int argumentsRegister)
-        {
-            ASSERT(argumentsRegister != -1);
-            m_argumentsRegister = argumentsRegister;
-            ASSERT(usesArguments());
-        }
-        int argumentsRegister() const
-        {
-            ASSERT(usesArguments());
-            return m_argumentsRegister;
-        }
-        int uncheckedArgumentsRegister()
-        {
-            if (!usesArguments())
-                return InvalidVirtualRegister;
-            return argumentsRegister();
-        }
-        void setActivationRegister(int activationRegister)
-        {
-            m_activationRegister = activationRegister;
-        }
-        int activationRegister() const
-        {
-            ASSERT(needsFullScopeChain());
-            return m_activationRegister;
-        }
-        int uncheckedActivationRegister()
-        {
-            if (!needsFullScopeChain())
-                return InvalidVirtualRegister;
-            return activationRegister();
-        }
-        bool usesArguments() const { return m_argumentsRegister != -1; }
</del><ins>+    void setArgumentsRegister(int argumentsRegister)
+    {
+        ASSERT(argumentsRegister != -1);
+        m_argumentsRegister = argumentsRegister;
+        ASSERT(usesArguments());
+    }
+    int argumentsRegister() const
+    {
+        ASSERT(usesArguments());
+        return m_argumentsRegister;
+    }
+    int uncheckedArgumentsRegister()
+    {
+        if (!usesArguments())
+            return InvalidVirtualRegister;
+        return argumentsRegister();
+    }
+    void setActivationRegister(int activationRegister)
+    {
+        m_activationRegister = activationRegister;
+    }
+    int activationRegister() const
+    {
+        ASSERT(needsFullScopeChain());
+        return m_activationRegister;
+    }
+    int uncheckedActivationRegister()
+    {
+        if (!needsFullScopeChain())
+            return InvalidVirtualRegister;
+        return activationRegister();
+    }
+    bool usesArguments() const { return m_argumentsRegister != -1; }
</ins><span class="cx">         
</span><del>-        bool needsActivation() const
-        {
-            return needsFullScopeChain() &amp;&amp; codeType() != GlobalCode;
-        }
</del><ins>+    bool needsActivation() const
+    {
+        return needsFullScopeChain() &amp;&amp; codeType() != GlobalCode;
+    }
</ins><span class="cx"> 
</span><del>-        bool isCaptured(int operand, InlineCallFrame* inlineCallFrame = 0) const
-        {
-            if (operandIsArgument(operand))
-                return operandToArgument(operand) &amp;&amp; usesArguments();
</del><ins>+    bool isCaptured(int operand, InlineCallFrame* inlineCallFrame = 0) const
+    {
+        if (operandIsArgument(operand))
+            return operandToArgument(operand) &amp;&amp; usesArguments();
</ins><span class="cx"> 
</span><del>-            if (inlineCallFrame)
-                return inlineCallFrame-&gt;capturedVars.get(operand);
</del><ins>+        if (inlineCallFrame)
+            return inlineCallFrame-&gt;capturedVars.get(operand);
</ins><span class="cx"> 
</span><del>-            // The activation object isn't in the captured region, but it's &quot;captured&quot;
-            // in the sense that stores to its location can be observed indirectly.
-            if (needsActivation() &amp;&amp; operand == activationRegister())
-                return true;
</del><ins>+        // The activation object isn't in the captured region, but it's &quot;captured&quot;
+        // in the sense that stores to its location can be observed indirectly.
+        if (needsActivation() &amp;&amp; operand == activationRegister())
+            return true;
</ins><span class="cx"> 
</span><del>-            // Ditto for the arguments object.
-            if (usesArguments() &amp;&amp; operand == argumentsRegister())
-                return true;
</del><ins>+        // Ditto for the arguments object.
+        if (usesArguments() &amp;&amp; operand == argumentsRegister())
+            return true;
</ins><span class="cx"> 
</span><del>-            // Ditto for the arguments object.
-            if (usesArguments() &amp;&amp; operand == unmodifiedArgumentsRegister(argumentsRegister()))
-                return true;
</del><ins>+        // Ditto for the arguments object.
+        if (usesArguments() &amp;&amp; operand == unmodifiedArgumentsRegister(argumentsRegister()))
+            return true;
</ins><span class="cx"> 
</span><del>-            // We're in global code so there are no locals to capture
-            if (!symbolTable())
-                return false;
</del><ins>+        // We're in global code so there are no locals to capture
+        if (!symbolTable())
+            return false;
</ins><span class="cx"> 
</span><del>-            return operand &gt;= symbolTable()-&gt;captureStart()
-                &amp;&amp; operand &lt; symbolTable()-&gt;captureEnd();
-        }
</del><ins>+        return operand &gt;= symbolTable()-&gt;captureStart()
+            &amp;&amp; operand &lt; symbolTable()-&gt;captureEnd();
+    }
</ins><span class="cx"> 
</span><del>-        CodeType codeType() const { return m_unlinkedCode-&gt;codeType(); }
</del><ins>+    CodeType codeType() const { return m_unlinkedCode-&gt;codeType(); }
</ins><span class="cx"> 
</span><del>-        SourceProvider* source() const { return m_source.get(); }
-        unsigned sourceOffset() const { return m_sourceOffset; }
</del><ins>+    SourceProvider* source() const { return m_source.get(); }
+    unsigned sourceOffset() const { return m_sourceOffset; }
</ins><span class="cx"> 
</span><del>-        size_t numberOfJumpTargets() const { return m_unlinkedCode-&gt;numberOfJumpTargets(); }
-        unsigned jumpTarget(int index) const { return m_unlinkedCode-&gt;jumpTarget(index); }
</del><ins>+    size_t numberOfJumpTargets() const { return m_unlinkedCode-&gt;numberOfJumpTargets(); }
+    unsigned jumpTarget(int index) const { return m_unlinkedCode-&gt;jumpTarget(index); }
</ins><span class="cx"> 
</span><del>-        void createActivation(CallFrame*);
</del><ins>+    void createActivation(CallFrame*);
</ins><span class="cx"> 
</span><del>-        void clearEvalCache();
</del><ins>+    void clearEvalCache();
</ins><span class="cx">         
</span><del>-        String nameForRegister(int registerNumber);
</del><ins>+    String nameForRegister(int registerNumber);
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-        void setNumberOfStructureStubInfos(size_t size) { m_structureStubInfos.grow(size); }
-        size_t numberOfStructureStubInfos() const { return m_structureStubInfos.size(); }
-        StructureStubInfo&amp; structureStubInfo(int index) { return m_structureStubInfos[index]; }
</del><ins>+    void setNumberOfStructureStubInfos(size_t size) { m_structureStubInfos.grow(size); }
+    size_t numberOfStructureStubInfos() const { return m_structureStubInfos.size(); }
+    StructureStubInfo&amp; structureStubInfo(int index) { return m_structureStubInfos[index]; }
</ins><span class="cx">         
</span><del>-        void setNumberOfByValInfos(size_t size) { m_byValInfos.grow(size); }
-        size_t numberOfByValInfos() const { return m_byValInfos.size(); }
-        ByValInfo&amp; byValInfo(size_t index) { return m_byValInfos[index]; }
</del><ins>+    void setNumberOfByValInfos(size_t size) { m_byValInfos.grow(size); }
+    size_t numberOfByValInfos() const { return m_byValInfos.size(); }
+    ByValInfo&amp; byValInfo(size_t index) { return m_byValInfos[index]; }
</ins><span class="cx"> 
</span><del>-        void setNumberOfCallLinkInfos(size_t size) { m_callLinkInfos.grow(size); }
-        size_t numberOfCallLinkInfos() const { return m_callLinkInfos.size(); }
-        CallLinkInfo&amp; callLinkInfo(int index) { return m_callLinkInfos[index]; }
</del><ins>+    void setNumberOfCallLinkInfos(size_t size) { m_callLinkInfos.grow(size); }
+    size_t numberOfCallLinkInfos() const { return m_callLinkInfos.size(); }
+    CallLinkInfo&amp; callLinkInfo(int index) { return m_callLinkInfos[index]; }
</ins><span class="cx"> #endif
</span><span class="cx">         
</span><span class="cx"> #if ENABLE(VALUE_PROFILER)
</span><del>-        unsigned numberOfArgumentValueProfiles()
-        {
-            ASSERT(m_numParameters &gt;= 0);
-            ASSERT(m_argumentValueProfiles.size() == static_cast&lt;unsigned&gt;(m_numParameters));
-            return m_argumentValueProfiles.size();
-        }
-        ValueProfile* valueProfileForArgument(unsigned argumentIndex)
-        {
-            ValueProfile* result = &amp;m_argumentValueProfiles[argumentIndex];
-            ASSERT(result-&gt;m_bytecodeOffset == -1);
-            return result;
-        }
</del><ins>+    unsigned numberOfArgumentValueProfiles()
+    {
+        ASSERT(m_numParameters &gt;= 0);
+        ASSERT(m_argumentValueProfiles.size() == static_cast&lt;unsigned&gt;(m_numParameters));
+        return m_argumentValueProfiles.size();
+    }
+    ValueProfile* valueProfileForArgument(unsigned argumentIndex)
+    {
+        ValueProfile* result = &amp;m_argumentValueProfiles[argumentIndex];
+        ASSERT(result-&gt;m_bytecodeOffset == -1);
+        return result;
+    }
</ins><span class="cx"> 
</span><del>-        unsigned numberOfValueProfiles() { return m_valueProfiles.size(); }
-        ValueProfile* valueProfile(int index) { return &amp;m_valueProfiles[index]; }
-        ValueProfile* valueProfileForBytecodeOffset(int bytecodeOffset)
-        {
-            ValueProfile* result = binarySearch&lt;ValueProfile, int&gt;(
-                m_valueProfiles, m_valueProfiles.size(), bytecodeOffset,
-                getValueProfileBytecodeOffset&lt;ValueProfile&gt;);
-            ASSERT(result-&gt;m_bytecodeOffset != -1);
-            ASSERT(instructions()[bytecodeOffset + opcodeLength(
-                       m_vm-&gt;interpreter-&gt;getOpcodeID(
-                           instructions()[
-                               bytecodeOffset].u.opcode)) - 1].u.profile == result);
-            return result;
-        }
-        SpeculatedType valueProfilePredictionForBytecodeOffset(const ConcurrentJITLocker&amp; locker, int bytecodeOffset)
-        {
-            return valueProfileForBytecodeOffset(bytecodeOffset)-&gt;computeUpdatedPrediction(locker);
-        }
</del><ins>+    unsigned numberOfValueProfiles() { return m_valueProfiles.size(); }
+    ValueProfile* valueProfile(int index) { return &amp;m_valueProfiles[index]; }
+    ValueProfile* valueProfileForBytecodeOffset(int bytecodeOffset)
+    {
+        ValueProfile* result = binarySearch&lt;ValueProfile, int&gt;(
+            m_valueProfiles, m_valueProfiles.size(), bytecodeOffset,
+            getValueProfileBytecodeOffset&lt;ValueProfile&gt;);
+        ASSERT(result-&gt;m_bytecodeOffset != -1);
+        ASSERT(instructions()[bytecodeOffset + opcodeLength(
+            m_vm-&gt;interpreter-&gt;getOpcodeID(
+                instructions()[
+                    bytecodeOffset].u.opcode)) - 1].u.profile == result);
+        return result;
+    }
+    SpeculatedType valueProfilePredictionForBytecodeOffset(const ConcurrentJITLocker&amp; locker, int bytecodeOffset)
+    {
+        return valueProfileForBytecodeOffset(bytecodeOffset)-&gt;computeUpdatedPrediction(locker);
+    }
</ins><span class="cx">         
</span><del>-        unsigned totalNumberOfValueProfiles()
-        {
-            return numberOfArgumentValueProfiles() + numberOfValueProfiles();
-        }
-        ValueProfile* getFromAllValueProfiles(unsigned index)
-        {
-            if (index &lt; numberOfArgumentValueProfiles())
-                return valueProfileForArgument(index);
-            return valueProfile(index - numberOfArgumentValueProfiles());
-        }
</del><ins>+    unsigned totalNumberOfValueProfiles()
+    {
+        return numberOfArgumentValueProfiles() + numberOfValueProfiles();
+    }
+    ValueProfile* getFromAllValueProfiles(unsigned index)
+    {
+        if (index &lt; numberOfArgumentValueProfiles())
+            return valueProfileForArgument(index);
+        return valueProfile(index - numberOfArgumentValueProfiles());
+    }
</ins><span class="cx">         
</span><del>-        RareCaseProfile* addRareCaseProfile(int bytecodeOffset)
-        {
-            m_rareCaseProfiles.append(RareCaseProfile(bytecodeOffset));
-            return &amp;m_rareCaseProfiles.last();
-        }
-        unsigned numberOfRareCaseProfiles() { return m_rareCaseProfiles.size(); }
-        RareCaseProfile* rareCaseProfile(int index) { return &amp;m_rareCaseProfiles[index]; }
-        RareCaseProfile* rareCaseProfileForBytecodeOffset(int bytecodeOffset)
-        {
-            return tryBinarySearch&lt;RareCaseProfile, int&gt;(
-                m_rareCaseProfiles, m_rareCaseProfiles.size(), bytecodeOffset,
-                getRareCaseProfileBytecodeOffset);
-        }
</del><ins>+    RareCaseProfile* addRareCaseProfile(int bytecodeOffset)
+    {
+        m_rareCaseProfiles.append(RareCaseProfile(bytecodeOffset));
+        return &amp;m_rareCaseProfiles.last();
+    }
+    unsigned numberOfRareCaseProfiles() { return m_rareCaseProfiles.size(); }
+    RareCaseProfile* rareCaseProfile(int index) { return &amp;m_rareCaseProfiles[index]; }
+    RareCaseProfile* rareCaseProfileForBytecodeOffset(int bytecodeOffset)
+    {
+        return tryBinarySearch&lt;RareCaseProfile, int&gt;(
+            m_rareCaseProfiles, m_rareCaseProfiles.size(), bytecodeOffset,
+            getRareCaseProfileBytecodeOffset);
+    }
</ins><span class="cx">         
</span><del>-        bool likelyToTakeSlowCase(int bytecodeOffset)
-        {
-            if (!hasBaselineJITProfiling())
-                return false;
-            unsigned value = rareCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
-            return value &gt;= Options::likelyToTakeSlowCaseMinimumCount();
-        }
</del><ins>+    bool likelyToTakeSlowCase(int bytecodeOffset)
+    {
+        if (!hasBaselineJITProfiling())
+            return false;
+        unsigned value = rareCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
+        return value &gt;= Options::likelyToTakeSlowCaseMinimumCount();
+    }
</ins><span class="cx">         
</span><del>-        bool couldTakeSlowCase(int bytecodeOffset)
-        {
-            if (!hasBaselineJITProfiling())
-                return false;
-            unsigned value = rareCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
-            return value &gt;= Options::couldTakeSlowCaseMinimumCount();
-        }
</del><ins>+    bool couldTakeSlowCase(int bytecodeOffset)
+    {
+        if (!hasBaselineJITProfiling())
+            return false;
+        unsigned value = rareCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
+        return value &gt;= Options::couldTakeSlowCaseMinimumCount();
+    }
</ins><span class="cx">         
</span><del>-        RareCaseProfile* addSpecialFastCaseProfile(int bytecodeOffset)
-        {
-            m_specialFastCaseProfiles.append(RareCaseProfile(bytecodeOffset));
-            return &amp;m_specialFastCaseProfiles.last();
-        }
-        unsigned numberOfSpecialFastCaseProfiles() { return m_specialFastCaseProfiles.size(); }
-        RareCaseProfile* specialFastCaseProfile(int index) { return &amp;m_specialFastCaseProfiles[index]; }
-        RareCaseProfile* specialFastCaseProfileForBytecodeOffset(int bytecodeOffset)
-        {
-            return tryBinarySearch&lt;RareCaseProfile, int&gt;(
-                m_specialFastCaseProfiles, m_specialFastCaseProfiles.size(), bytecodeOffset,
-                getRareCaseProfileBytecodeOffset);
-        }
</del><ins>+    RareCaseProfile* addSpecialFastCaseProfile(int bytecodeOffset)
+    {
+        m_specialFastCaseProfiles.append(RareCaseProfile(bytecodeOffset));
+        return &amp;m_specialFastCaseProfiles.last();
+    }
+    unsigned numberOfSpecialFastCaseProfiles() { return m_specialFastCaseProfiles.size(); }
+    RareCaseProfile* specialFastCaseProfile(int index) { return &amp;m_specialFastCaseProfiles[index]; }
+    RareCaseProfile* specialFastCaseProfileForBytecodeOffset(int bytecodeOffset)
+    {
+        return tryBinarySearch&lt;RareCaseProfile, int&gt;(
+            m_specialFastCaseProfiles, m_specialFastCaseProfiles.size(), bytecodeOffset,
+            getRareCaseProfileBytecodeOffset);
+    }
</ins><span class="cx">         
</span><del>-        bool likelyToTakeSpecialFastCase(int bytecodeOffset)
-        {
-            if (!hasBaselineJITProfiling())
-                return false;
-            unsigned specialFastCaseCount = specialFastCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
-            return specialFastCaseCount &gt;= Options::likelyToTakeSlowCaseMinimumCount();
-        }
</del><ins>+    bool likelyToTakeSpecialFastCase(int bytecodeOffset)
+    {
+        if (!hasBaselineJITProfiling())
+            return false;
+        unsigned specialFastCaseCount = specialFastCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
+        return specialFastCaseCount &gt;= Options::likelyToTakeSlowCaseMinimumCount();
+    }
</ins><span class="cx">         
</span><del>-        bool couldTakeSpecialFastCase(int bytecodeOffset)
-        {
-            if (!hasBaselineJITProfiling())
-                return false;
-            unsigned specialFastCaseCount = specialFastCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
-            return specialFastCaseCount &gt;= Options::couldTakeSlowCaseMinimumCount();
-        }
</del><ins>+    bool couldTakeSpecialFastCase(int bytecodeOffset)
+    {
+        if (!hasBaselineJITProfiling())
+            return false;
+        unsigned specialFastCaseCount = specialFastCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
+        return specialFastCaseCount &gt;= Options::couldTakeSlowCaseMinimumCount();
+    }
</ins><span class="cx">         
</span><del>-        bool likelyToTakeDeepestSlowCase(int bytecodeOffset)
-        {
-            if (!hasBaselineJITProfiling())
-                return false;
-            unsigned slowCaseCount = rareCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
-            unsigned specialFastCaseCount = specialFastCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
-            unsigned value = slowCaseCount - specialFastCaseCount;
-            return value &gt;= Options::likelyToTakeSlowCaseMinimumCount();
-        }
</del><ins>+    bool likelyToTakeDeepestSlowCase(int bytecodeOffset)
+    {
+        if (!hasBaselineJITProfiling())
+            return false;
+        unsigned slowCaseCount = rareCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
+        unsigned specialFastCaseCount = specialFastCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
+        unsigned value = slowCaseCount - specialFastCaseCount;
+        return value &gt;= Options::likelyToTakeSlowCaseMinimumCount();
+    }
</ins><span class="cx">         
</span><del>-        bool likelyToTakeAnySlowCase(int bytecodeOffset)
-        {
-            if (!hasBaselineJITProfiling())
-                return false;
-            unsigned slowCaseCount = rareCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
-            unsigned specialFastCaseCount = specialFastCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
-            unsigned value = slowCaseCount + specialFastCaseCount;
-            return value &gt;= Options::likelyToTakeSlowCaseMinimumCount();
-        }
</del><ins>+    bool likelyToTakeAnySlowCase(int bytecodeOffset)
+    {
+        if (!hasBaselineJITProfiling())
+            return false;
+        unsigned slowCaseCount = rareCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
+        unsigned specialFastCaseCount = specialFastCaseProfileForBytecodeOffset(bytecodeOffset)-&gt;m_counter;
+        unsigned value = slowCaseCount + specialFastCaseCount;
+        return value &gt;= Options::likelyToTakeSlowCaseMinimumCount();
+    }
</ins><span class="cx">         
</span><del>-        unsigned numberOfArrayProfiles() const { return m_arrayProfiles.size(); }
-        const ArrayProfileVector&amp; arrayProfiles() { return m_arrayProfiles; }
-        ArrayProfile* addArrayProfile(unsigned bytecodeOffset)
-        {
-            m_arrayProfiles.append(ArrayProfile(bytecodeOffset));
-            return &amp;m_arrayProfiles.last();
-        }
-        ArrayProfile* getArrayProfile(unsigned bytecodeOffset);
-        ArrayProfile* getOrAddArrayProfile(unsigned bytecodeOffset);
</del><ins>+    unsigned numberOfArrayProfiles() const { return m_arrayProfiles.size(); }
+    const ArrayProfileVector&amp; arrayProfiles() { return m_arrayProfiles; }
+    ArrayProfile* addArrayProfile(unsigned bytecodeOffset)
+    {
+        m_arrayProfiles.append(ArrayProfile(bytecodeOffset));
+        return &amp;m_arrayProfiles.last();
+    }
+    ArrayProfile* getArrayProfile(unsigned bytecodeOffset);
+    ArrayProfile* getOrAddArrayProfile(unsigned bytecodeOffset);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        // Exception handling support
</del><ins>+    // Exception handling support
</ins><span class="cx"> 
</span><del>-        size_t numberOfExceptionHandlers() const { return m_rareData ? m_rareData-&gt;m_exceptionHandlers.size() : 0; }
-        void allocateHandlers(const Vector&lt;UnlinkedHandlerInfo&gt;&amp; unlinkedHandlers)
-        {
-            size_t count = unlinkedHandlers.size();
-            if (!count)
-                return;
-            createRareDataIfNecessary();
-            m_rareData-&gt;m_exceptionHandlers.resize(count);
-            for (size_t i = 0; i &lt; count; ++i) {
-                m_rareData-&gt;m_exceptionHandlers[i].start = unlinkedHandlers[i].start;
-                m_rareData-&gt;m_exceptionHandlers[i].end = unlinkedHandlers[i].end;
-                m_rareData-&gt;m_exceptionHandlers[i].target = unlinkedHandlers[i].target;
-                m_rareData-&gt;m_exceptionHandlers[i].scopeDepth = unlinkedHandlers[i].scopeDepth;
-            }
-
</del><ins>+    size_t numberOfExceptionHandlers() const { return m_rareData ? m_rareData-&gt;m_exceptionHandlers.size() : 0; }
+    void allocateHandlers(const Vector&lt;UnlinkedHandlerInfo&gt;&amp; unlinkedHandlers)
+    {
+        size_t count = unlinkedHandlers.size();
+        if (!count)
+            return;
+        createRareDataIfNecessary();
+        m_rareData-&gt;m_exceptionHandlers.resize(count);
+        for (size_t i = 0; i &lt; count; ++i) {
+            m_rareData-&gt;m_exceptionHandlers[i].start = unlinkedHandlers[i].start;
+            m_rareData-&gt;m_exceptionHandlers[i].end = unlinkedHandlers[i].end;
+            m_rareData-&gt;m_exceptionHandlers[i].target = unlinkedHandlers[i].target;
+            m_rareData-&gt;m_exceptionHandlers[i].scopeDepth = unlinkedHandlers[i].scopeDepth;
</ins><span class="cx">         }
</span><del>-        HandlerInfo&amp; exceptionHandler(int index) { RELEASE_ASSERT(m_rareData); return m_rareData-&gt;m_exceptionHandlers[index]; }
</del><span class="cx"> 
</span><del>-        bool hasExpressionInfo() { return m_unlinkedCode-&gt;hasExpressionInfo(); }
</del><ins>+    }
+    HandlerInfo&amp; exceptionHandler(int index) { RELEASE_ASSERT(m_rareData); return m_rareData-&gt;m_exceptionHandlers[index]; }
</ins><span class="cx"> 
</span><ins>+    bool hasExpressionInfo() { return m_unlinkedCode-&gt;hasExpressionInfo(); }
+
</ins><span class="cx"> #if ENABLE(JIT)
</span><del>-        Vector&lt;CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow&gt;&amp; callReturnIndexVector()
-        {
-            createRareDataIfNecessary();
-            return m_rareData-&gt;m_callReturnIndexVector;
-        }
</del><ins>+    Vector&lt;CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow&gt;&amp; callReturnIndexVector()
+    {
+        createRareDataIfNecessary();
+        return m_rareData-&gt;m_callReturnIndexVector;
+    }
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-        SegmentedVector&lt;InlineCallFrame, 4&gt;&amp; inlineCallFrames()
-        {
-            createRareDataIfNecessary();
-            return m_rareData-&gt;m_inlineCallFrames;
-        }
</del><ins>+    SegmentedVector&lt;InlineCallFrame, 4&gt;&amp; inlineCallFrames()
+    {
+        createRareDataIfNecessary();
+        return m_rareData-&gt;m_inlineCallFrames;
+    }
</ins><span class="cx">         
</span><del>-        Vector&lt;CodeOriginAtCallReturnOffset, 0, UnsafeVectorOverflow&gt;&amp; codeOrigins()
-        {
-            createRareDataIfNecessary();
-            return m_rareData-&gt;m_codeOrigins;
-        }
</del><ins>+    Vector&lt;CodeOriginAtCallReturnOffset, 0, UnsafeVectorOverflow&gt;&amp; codeOrigins()
+    {
+        createRareDataIfNecessary();
+        return m_rareData-&gt;m_codeOrigins;
+    }
</ins><span class="cx">         
</span><del>-        // Having code origins implies that there has been some inlining.
-        bool hasCodeOrigins()
-        {
-            return m_rareData &amp;&amp; !!m_rareData-&gt;m_codeOrigins.size();
-        }
</del><ins>+    // Having code origins implies that there has been some inlining.
+    bool hasCodeOrigins()
+    {
+        return m_rareData &amp;&amp; !!m_rareData-&gt;m_codeOrigins.size();
+    }
</ins><span class="cx">         
</span><del>-        bool codeOriginForReturn(ReturnAddressPtr, CodeOrigin&amp;);
</del><ins>+    bool codeOriginForReturn(ReturnAddressPtr, CodeOrigin&amp;);
</ins><span class="cx">         
</span><del>-        CodeOrigin codeOrigin(unsigned index)
-        {
-            RELEASE_ASSERT(m_rareData);
-            return m_rareData-&gt;m_codeOrigins[index].codeOrigin;
-        }
</del><ins>+    CodeOrigin codeOrigin(unsigned index)
+    {
+        RELEASE_ASSERT(m_rareData);
+        return m_rareData-&gt;m_codeOrigins[index].codeOrigin;
+    }
</ins><span class="cx">         
</span><del>-        bool addFrequentExitSite(const DFG::FrequentExitSite&amp; site)
-        {
-            ASSERT(JITCode::isBaselineCode(jitType()));
-            return m_exitProfile.add(site);
-        }
</del><ins>+    bool addFrequentExitSite(const DFG::FrequentExitSite&amp; site)
+    {
+        ASSERT(JITCode::isBaselineCode(jitType()));
+        return m_exitProfile.add(site);
+    }
</ins><span class="cx">         
</span><del>-        bool hasExitSite(const DFG::FrequentExitSite&amp; site) const { return m_exitProfile.hasExitSite(site); }
</del><ins>+    bool hasExitSite(const DFG::FrequentExitSite&amp; site) const { return m_exitProfile.hasExitSite(site); }
</ins><span class="cx"> 
</span><del>-        DFG::ExitProfile&amp; exitProfile() { return m_exitProfile; }
</del><ins>+    DFG::ExitProfile&amp; exitProfile() { return m_exitProfile; }
</ins><span class="cx">         
</span><del>-        CompressedLazyOperandValueProfileHolder&amp; lazyOperandValueProfiles()
-        {
-            return m_lazyOperandValueProfiles;
-        }
</del><ins>+    CompressedLazyOperandValueProfileHolder&amp; lazyOperandValueProfiles()
+    {
+        return m_lazyOperandValueProfiles;
+    }
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        // Constant Pool
</del><ins>+    // Constant Pool
</ins><span class="cx"> 
</span><del>-        size_t numberOfIdentifiers() const { return m_identifiers.size(); }
-        void addIdentifier(const Identifier&amp; i) { return m_identifiers.append(i); }
-        Identifier&amp; identifier(int index) { return m_identifiers[index]; }
</del><ins>+    size_t numberOfIdentifiers() const { return m_identifiers.size(); }
+    void addIdentifier(const Identifier&amp; i) { return m_identifiers.append(i); }
+    Identifier&amp; identifier(int index) { return m_identifiers[index]; }
</ins><span class="cx"> 
</span><del>-        size_t numberOfConstantRegisters() const { return m_constantRegisters.size(); }
-        unsigned addConstant(JSValue v)
-        {
-            unsigned result = m_constantRegisters.size();
-            m_constantRegisters.append(WriteBarrier&lt;Unknown&gt;());
-            m_constantRegisters.last().set(m_globalObject-&gt;vm(), m_ownerExecutable.get(), v);
-            return result;
-        }
</del><ins>+    size_t numberOfConstantRegisters() const { return m_constantRegisters.size(); }
+    unsigned addConstant(JSValue v)
+    {
+        unsigned result = m_constantRegisters.size();
+        m_constantRegisters.append(WriteBarrier&lt;Unknown&gt;());
+        m_constantRegisters.last().set(m_globalObject-&gt;vm(), m_ownerExecutable.get(), v);
+        return result;
+    }
</ins><span class="cx"> 
</span><span class="cx"> 
</span><del>-        unsigned addOrFindConstant(JSValue);
-        WriteBarrier&lt;Unknown&gt;&amp; constantRegister(int index) { return m_constantRegisters[index - FirstConstantRegisterIndex]; }
-        ALWAYS_INLINE bool isConstantRegisterIndex(int index) const { return index &gt;= FirstConstantRegisterIndex; }
-        ALWAYS_INLINE JSValue getConstant(int index) const { return m_constantRegisters[index - FirstConstantRegisterIndex].get(); }
</del><ins>+    unsigned addOrFindConstant(JSValue);
+    WriteBarrier&lt;Unknown&gt;&amp; constantRegister(int index) { return m_constantRegisters[index - FirstConstantRegisterIndex]; }
+    ALWAYS_INLINE bool isConstantRegisterIndex(int index) const { return index &gt;= FirstConstantRegisterIndex; }
+    ALWAYS_INLINE JSValue getConstant(int index) const { return m_constantRegisters[index - FirstConstantRegisterIndex].get(); }
</ins><span class="cx"> 
</span><del>-        FunctionExecutable* functionDecl(int index) { return m_functionDecls[index].get(); }
-        int numberOfFunctionDecls() { return m_functionDecls.size(); }
-        FunctionExecutable* functionExpr(int index) { return m_functionExprs[index].get(); }
</del><ins>+    FunctionExecutable* functionDecl(int index) { return m_functionDecls[index].get(); }
+    int numberOfFunctionDecls() { return m_functionDecls.size(); }
+    FunctionExecutable* functionExpr(int index) { return m_functionExprs[index].get(); }
</ins><span class="cx"> 
</span><del>-        RegExp* regexp(int index) const { return m_unlinkedCode-&gt;regexp(index); }
</del><ins>+    RegExp* regexp(int index) const { return m_unlinkedCode-&gt;regexp(index); }
</ins><span class="cx"> 
</span><del>-        unsigned numberOfConstantBuffers() const
-        {
-            if (!m_rareData)
-                return 0;
-            return m_rareData-&gt;m_constantBuffers.size();
-        }
-        unsigned addConstantBuffer(const Vector&lt;JSValue&gt;&amp; buffer)
-        {
-            createRareDataIfNecessary();
-            unsigned size = m_rareData-&gt;m_constantBuffers.size();
-            m_rareData-&gt;m_constantBuffers.append(buffer);
-            return size;
-        }
</del><ins>+    unsigned numberOfConstantBuffers() const
+    {
+        if (!m_rareData)
+            return 0;
+        return m_rareData-&gt;m_constantBuffers.size();
+    }
+    unsigned addConstantBuffer(const Vector&lt;JSValue&gt;&amp; buffer)
+    {
+        createRareDataIfNecessary();
+        unsigned size = m_rareData-&gt;m_constantBuffers.size();
+        m_rareData-&gt;m_constantBuffers.append(buffer);
+        return size;
+    }
</ins><span class="cx"> 
</span><del>-        Vector&lt;JSValue&gt;&amp; constantBufferAsVector(unsigned index)
-        {
-            ASSERT(m_rareData);
-            return m_rareData-&gt;m_constantBuffers[index];
-        }
-        JSValue* constantBuffer(unsigned index)
-        {
-            return constantBufferAsVector(index).data();
-        }
</del><ins>+    Vector&lt;JSValue&gt;&amp; constantBufferAsVector(unsigned index)
+    {
+        ASSERT(m_rareData);
+        return m_rareData-&gt;m_constantBuffers[index];
+    }
+    JSValue* constantBuffer(unsigned index)
+    {
+        return constantBufferAsVector(index).data();
+    }
</ins><span class="cx"> 
</span><del>-        JSGlobalObject* globalObject() { return m_globalObject.get(); }
</del><ins>+    JSGlobalObject* globalObject() { return m_globalObject.get(); }
</ins><span class="cx">         
</span><del>-        JSGlobalObject* globalObjectFor(CodeOrigin);
</del><ins>+    JSGlobalObject* globalObjectFor(CodeOrigin);
</ins><span class="cx"> 
</span><del>-        // Jump Tables
</del><ins>+    // Jump Tables
</ins><span class="cx"> 
</span><del>-        size_t numberOfImmediateSwitchJumpTables() const { return m_rareData ? m_rareData-&gt;m_immediateSwitchJumpTables.size() : 0; }
-        SimpleJumpTable&amp; addImmediateSwitchJumpTable() { createRareDataIfNecessary(); m_rareData-&gt;m_immediateSwitchJumpTables.append(SimpleJumpTable()); return m_rareData-&gt;m_immediateSwitchJumpTables.last(); }
-        SimpleJumpTable&amp; immediateSwitchJumpTable(int tableIndex) { RELEASE_ASSERT(m_rareData); return m_rareData-&gt;m_immediateSwitchJumpTables[tableIndex]; }
</del><ins>+    size_t numberOfImmediateSwitchJumpTables() const { return m_rareData ? m_rareData-&gt;m_immediateSwitchJumpTables.size() : 0; }
+    SimpleJumpTable&amp; addImmediateSwitchJumpTable() { createRareDataIfNecessary(); m_rareData-&gt;m_immediateSwitchJumpTables.append(SimpleJumpTable()); return m_rareData-&gt;m_immediateSwitchJumpTables.last(); }
+    SimpleJumpTable&amp; immediateSwitchJumpTable(int tableIndex) { RELEASE_ASSERT(m_rareData); return m_rareData-&gt;m_immediateSwitchJumpTables[tableIndex]; }
</ins><span class="cx"> 
</span><del>-        size_t numberOfCharacterSwitchJumpTables() const { return m_rareData ? m_rareData-&gt;m_characterSwitchJumpTables.size() : 0; }
-        SimpleJumpTable&amp; addCharacterSwitchJumpTable() { createRareDataIfNecessary(); m_rareData-&gt;m_characterSwitchJumpTables.append(SimpleJumpTable()); return m_rareData-&gt;m_characterSwitchJumpTables.last(); }
-        SimpleJumpTable&amp; characterSwitchJumpTable(int tableIndex) { RELEASE_ASSERT(m_rareData); return m_rareData-&gt;m_characterSwitchJumpTables[tableIndex]; }
</del><ins>+    size_t numberOfCharacterSwitchJumpTables() const { return m_rareData ? m_rareData-&gt;m_characterSwitchJumpTables.size() : 0; }
+    SimpleJumpTable&amp; addCharacterSwitchJumpTable() { createRareDataIfNecessary(); m_rareData-&gt;m_characterSwitchJumpTables.append(SimpleJumpTable()); return m_rareData-&gt;m_characterSwitchJumpTables.last(); }
+    SimpleJumpTable&amp; characterSwitchJumpTable(int tableIndex) { RELEASE_ASSERT(m_rareData); return m_rareData-&gt;m_characterSwitchJumpTables[tableIndex]; }
</ins><span class="cx"> 
</span><del>-        size_t numberOfStringSwitchJumpTables() const { return m_rareData ? m_rareData-&gt;m_stringSwitchJumpTables.size() : 0; }
-        StringJumpTable&amp; addStringSwitchJumpTable() { createRareDataIfNecessary(); m_rareData-&gt;m_stringSwitchJumpTables.append(StringJumpTable()); return m_rareData-&gt;m_stringSwitchJumpTables.last(); }
-        StringJumpTable&amp; stringSwitchJumpTable(int tableIndex) { RELEASE_ASSERT(m_rareData); return m_rareData-&gt;m_stringSwitchJumpTables[tableIndex]; }
</del><ins>+    size_t numberOfStringSwitchJumpTables() const { return m_rareData ? m_rareData-&gt;m_stringSwitchJumpTables.size() : 0; }
+    StringJumpTable&amp; addStringSwitchJumpTable() { createRareDataIfNecessary(); m_rareData-&gt;m_stringSwitchJumpTables.append(StringJumpTable()); return m_rareData-&gt;m_stringSwitchJumpTables.last(); }
+    StringJumpTable&amp; stringSwitchJumpTable(int tableIndex) { RELEASE_ASSERT(m_rareData); return m_rareData-&gt;m_stringSwitchJumpTables[tableIndex]; }
</ins><span class="cx"> 
</span><span class="cx"> 
</span><del>-        SharedSymbolTable* symbolTable() const { return m_unlinkedCode-&gt;symbolTable(); }
</del><ins>+    SharedSymbolTable* symbolTable() const { return m_unlinkedCode-&gt;symbolTable(); }
</ins><span class="cx"> 
</span><del>-        EvalCodeCache&amp; evalCodeCache() { createRareDataIfNecessary(); return m_rareData-&gt;m_evalCodeCache; }
</del><ins>+    EvalCodeCache&amp; evalCodeCache() { createRareDataIfNecessary(); return m_rareData-&gt;m_evalCodeCache; }
</ins><span class="cx"> 
</span><del>-        enum ShrinkMode {
-            // Shrink prior to generating machine code that may point directly into vectors.
-            EarlyShrink,
</del><ins>+    enum ShrinkMode {
+        // Shrink prior to generating machine code that may point directly into vectors.
+        EarlyShrink,
</ins><span class="cx">             
</span><del>-            // Shrink after generating machine code, and after possibly creating new vectors
-            // and appending to others. At this time it is not safe to shrink certain vectors
-            // because we would have generated machine code that references them directly.
-            LateShrink
-        };
-        void shrinkToFit(ShrinkMode);
</del><ins>+        // Shrink after generating machine code, and after possibly creating new vectors
+        // and appending to others. At this time it is not safe to shrink certain vectors
+        // because we would have generated machine code that references them directly.
+        LateShrink
+    };
+    void shrinkToFit(ShrinkMode);
</ins><span class="cx">         
</span><del>-        void copyPostParseDataFrom(CodeBlock* alternative);
-        void copyPostParseDataFromAlternative();
</del><ins>+    void copyPostParseDataFrom(CodeBlock* alternative);
+    void copyPostParseDataFromAlternative();
</ins><span class="cx">         
</span><del>-        // Functions for controlling when JITting kicks in, in a mixed mode
-        // execution world.
</del><ins>+    // Functions for controlling when JITting kicks in, in a mixed mode
+    // execution world.
</ins><span class="cx">         
</span><del>-        bool checkIfJITThresholdReached()
-        {
-            return m_llintExecuteCounter.checkIfThresholdCrossedAndSet(this);
-        }
</del><ins>+    bool checkIfJITThresholdReached()
+    {
+        return m_llintExecuteCounter.checkIfThresholdCrossedAndSet(this);
+    }
</ins><span class="cx">         
</span><del>-        void dontJITAnytimeSoon()
-        {
-            m_llintExecuteCounter.deferIndefinitely();
-        }
</del><ins>+    void dontJITAnytimeSoon()
+    {
+        m_llintExecuteCounter.deferIndefinitely();
+    }
</ins><span class="cx">         
</span><del>-        void jitAfterWarmUp()
-        {
-            m_llintExecuteCounter.setNewThreshold(Options::thresholdForJITAfterWarmUp(), this);
-        }
</del><ins>+    void jitAfterWarmUp()
+    {
+        m_llintExecuteCounter.setNewThreshold(Options::thresholdForJITAfterWarmUp(), this);
+    }
</ins><span class="cx">         
</span><del>-        void jitSoon()
-        {
-            m_llintExecuteCounter.setNewThreshold(Options::thresholdForJITSoon(), this);
-        }
</del><ins>+    void jitSoon()
+    {
+        m_llintExecuteCounter.setNewThreshold(Options::thresholdForJITSoon(), this);
+    }
</ins><span class="cx">         
</span><del>-        const ExecutionCounter&amp; llintExecuteCounter() const
-        {
-            return m_llintExecuteCounter;
-        }
</del><ins>+    const ExecutionCounter&amp; llintExecuteCounter() const
+    {
+        return m_llintExecuteCounter;
+    }
</ins><span class="cx">         
</span><del>-        // Functions for controlling when tiered compilation kicks in. This
-        // controls both when the optimizing compiler is invoked and when OSR
-        // entry happens. Two triggers exist: the loop trigger and the return
-        // trigger. In either case, when an addition to m_jitExecuteCounter
-        // causes it to become non-negative, the optimizing compiler is
-        // invoked. This includes a fast check to see if this CodeBlock has
-        // already been optimized (i.e. replacement() returns a CodeBlock
-        // that was optimized with a higher tier JIT than this one). In the
-        // case of the loop trigger, if the optimized compilation succeeds
-        // (or has already succeeded in the past) then OSR is attempted to
-        // redirect program flow into the optimized code.
</del><ins>+    // Functions for controlling when tiered compilation kicks in. This
+    // controls both when the optimizing compiler is invoked and when OSR
+    // entry happens. Two triggers exist: the loop trigger and the return
+    // trigger. In either case, when an addition to m_jitExecuteCounter
+    // causes it to become non-negative, the optimizing compiler is
+    // invoked. This includes a fast check to see if this CodeBlock has
+    // already been optimized (i.e. replacement() returns a CodeBlock
+    // that was optimized with a higher tier JIT than this one). In the
+    // case of the loop trigger, if the optimized compilation succeeds
+    // (or has already succeeded in the past) then OSR is attempted to
+    // redirect program flow into the optimized code.
</ins><span class="cx">         
</span><del>-        // These functions are called from within the optimization triggers,
-        // and are used as a single point at which we define the heuristics
-        // for how much warm-up is mandated before the next optimization
-        // trigger files. All CodeBlocks start out with optimizeAfterWarmUp(),
-        // as this is called from the CodeBlock constructor.
</del><ins>+    // These functions are called from within the optimization triggers,
+    // and are used as a single point at which we define the heuristics
+    // for how much warm-up is mandated before the next optimization
+    // trigger files. All CodeBlocks start out with optimizeAfterWarmUp(),
+    // as this is called from the CodeBlock constructor.
</ins><span class="cx">         
</span><del>-        // When we observe a lot of speculation failures, we trigger a
-        // reoptimization. But each time, we increase the optimization trigger
-        // to avoid thrashing.
-        unsigned reoptimizationRetryCounter() const;
-        void countReoptimization();
</del><ins>+    // When we observe a lot of speculation failures, we trigger a
+    // reoptimization. But each time, we increase the optimization trigger
+    // to avoid thrashing.
+    unsigned reoptimizationRetryCounter() const;
+    void countReoptimization();
</ins><span class="cx"> 
</span><del>-        int32_t codeTypeThresholdMultiplier() const;
</del><ins>+    int32_t codeTypeThresholdMultiplier() const;
</ins><span class="cx">         
</span><del>-        int32_t counterValueForOptimizeAfterWarmUp();
-        int32_t counterValueForOptimizeAfterLongWarmUp();
-        int32_t counterValueForOptimizeSoon();
</del><ins>+    int32_t counterValueForOptimizeAfterWarmUp();
+    int32_t counterValueForOptimizeAfterLongWarmUp();
+    int32_t counterValueForOptimizeSoon();
</ins><span class="cx">         
</span><del>-        int32_t* addressOfJITExecuteCounter()
-        {
-            return &amp;m_jitExecuteCounter.m_counter;
-        }
</del><ins>+    int32_t* addressOfJITExecuteCounter()
+    {
+        return &amp;m_jitExecuteCounter.m_counter;
+    }
</ins><span class="cx">         
</span><del>-        static ptrdiff_t offsetOfJITExecuteCounter() { return OBJECT_OFFSETOF(CodeBlock, m_jitExecuteCounter) + OBJECT_OFFSETOF(ExecutionCounter, m_counter); }
-        static ptrdiff_t offsetOfJITExecutionActiveThreshold() { return OBJECT_OFFSETOF(CodeBlock, m_jitExecuteCounter) + OBJECT_OFFSETOF(ExecutionCounter, m_activeThreshold); }
-        static ptrdiff_t offsetOfJITExecutionTotalCount() { return OBJECT_OFFSETOF(CodeBlock, m_jitExecuteCounter) + OBJECT_OFFSETOF(ExecutionCounter, m_totalCount); }
</del><ins>+    static ptrdiff_t offsetOfJITExecuteCounter() { return OBJECT_OFFSETOF(CodeBlock, m_jitExecuteCounter) + OBJECT_OFFSETOF(ExecutionCounter, m_counter); }
+    static ptrdiff_t offsetOfJITExecutionActiveThreshold() { return OBJECT_OFFSETOF(CodeBlock, m_jitExecuteCounter) + OBJECT_OFFSETOF(ExecutionCounter, m_activeThreshold); }
+    static ptrdiff_t offsetOfJITExecutionTotalCount() { return OBJECT_OFFSETOF(CodeBlock, m_jitExecuteCounter) + OBJECT_OFFSETOF(ExecutionCounter, m_totalCount); }
</ins><span class="cx"> 
</span><del>-        const ExecutionCounter&amp; jitExecuteCounter() const { return m_jitExecuteCounter; }
</del><ins>+    const ExecutionCounter&amp; jitExecuteCounter() const { return m_jitExecuteCounter; }
</ins><span class="cx">         
</span><del>-        unsigned optimizationDelayCounter() const { return m_optimizationDelayCounter; }
</del><ins>+    unsigned optimizationDelayCounter() const { return m_optimizationDelayCounter; }
</ins><span class="cx">         
</span><del>-        // Check if the optimization threshold has been reached, and if not,
-        // adjust the heuristics accordingly. Returns true if the threshold has
-        // been reached.
-        bool checkIfOptimizationThresholdReached();
</del><ins>+    // Check if the optimization threshold has been reached, and if not,
+    // adjust the heuristics accordingly. Returns true if the threshold has
+    // been reached.
+    bool checkIfOptimizationThresholdReached();
</ins><span class="cx">         
</span><del>-        // Call this to force the next optimization trigger to fire. This is
-        // rarely wise, since optimization triggers are typically more
-        // expensive than executing baseline code.
-        void optimizeNextInvocation();
</del><ins>+    // Call this to force the next optimization trigger to fire. This is
+    // rarely wise, since optimization triggers are typically more
+    // expensive than executing baseline code.
+    void optimizeNextInvocation();
</ins><span class="cx">         
</span><del>-        // Call this to prevent optimization from happening again. Note that
-        // optimization will still happen after roughly 2^29 invocations,
-        // so this is really meant to delay that as much as possible. This
-        // is called if optimization failed, and we expect it to fail in
-        // the future as well.
-        void dontOptimizeAnytimeSoon();
</del><ins>+    // Call this to prevent optimization from happening again. Note that
+    // optimization will still happen after roughly 2^29 invocations,
+    // so this is really meant to delay that as much as possible. This
+    // is called if optimization failed, and we expect it to fail in
+    // the future as well.
+    void dontOptimizeAnytimeSoon();
</ins><span class="cx">         
</span><del>-        // Call this to reinitialize the counter to its starting state,
-        // forcing a warm-up to happen before the next optimization trigger
-        // fires. This is called in the CodeBlock constructor. It also
-        // makes sense to call this if an OSR exit occurred. Note that
-        // OSR exit code is code generated, so the value of the execute
-        // counter that this corresponds to is also available directly.
-        void optimizeAfterWarmUp();
</del><ins>+    // Call this to reinitialize the counter to its starting state,
+    // forcing a warm-up to happen before the next optimization trigger
+    // fires. This is called in the CodeBlock constructor. It also
+    // makes sense to call this if an OSR exit occurred. Note that
+    // OSR exit code is code generated, so the value of the execute
+    // counter that this corresponds to is also available directly.
+    void optimizeAfterWarmUp();
</ins><span class="cx">         
</span><del>-        // Call this to force an optimization trigger to fire only after
-        // a lot of warm-up.
-        void optimizeAfterLongWarmUp();
</del><ins>+    // Call this to force an optimization trigger to fire only after
+    // a lot of warm-up.
+    void optimizeAfterLongWarmUp();
</ins><span class="cx">         
</span><del>-        // Call this to cause an optimization trigger to fire soon, but
-        // not necessarily the next one. This makes sense if optimization
-        // succeeds. Successfuly optimization means that all calls are
-        // relinked to the optimized code, so this only affects call
-        // frames that are still executing this CodeBlock. The value here
-        // is tuned to strike a balance between the cost of OSR entry
-        // (which is too high to warrant making every loop back edge to
-        // trigger OSR immediately) and the cost of executing baseline
-        // code (which is high enough that we don't necessarily want to
-        // have a full warm-up). The intuition for calling this instead of
-        // optimizeNextInvocation() is for the case of recursive functions
-        // with loops. Consider that there may be N call frames of some
-        // recursive function, for a reasonably large value of N. The top
-        // one triggers optimization, and then returns, and then all of
-        // the others return. We don't want optimization to be triggered on
-        // each return, as that would be superfluous. It only makes sense
-        // to trigger optimization if one of those functions becomes hot
-        // in the baseline code.
-        void optimizeSoon();
</del><ins>+    // Call this to cause an optimization trigger to fire soon, but
+    // not necessarily the next one. This makes sense if optimization
+    // succeeds. Successfuly optimization means that all calls are
+    // relinked to the optimized code, so this only affects call
+    // frames that are still executing this CodeBlock. The value here
+    // is tuned to strike a balance between the cost of OSR entry
+    // (which is too high to warrant making every loop back edge to
+    // trigger OSR immediately) and the cost of executing baseline
+    // code (which is high enough that we don't necessarily want to
+    // have a full warm-up). The intuition for calling this instead of
+    // optimizeNextInvocation() is for the case of recursive functions
+    // with loops. Consider that there may be N call frames of some
+    // recursive function, for a reasonably large value of N. The top
+    // one triggers optimization, and then returns, and then all of
+    // the others return. We don't want optimization to be triggered on
+    // each return, as that would be superfluous. It only makes sense
+    // to trigger optimization if one of those functions becomes hot
+    // in the baseline code.
+    void optimizeSoon();
</ins><span class="cx">     
</span><del>-        void forceOptimizationSlowPathConcurrently();
</del><ins>+    void forceOptimizationSlowPathConcurrently();
</ins><span class="cx">     
</span><del>-        void setOptimizationThresholdBasedOnCompilationResult(CompilationResult);
</del><ins>+    void setOptimizationThresholdBasedOnCompilationResult(CompilationResult);
</ins><span class="cx">         
</span><del>-        uint32_t osrExitCounter() const { return m_osrExitCounter; }
</del><ins>+    uint32_t osrExitCounter() const { return m_osrExitCounter; }
</ins><span class="cx">         
</span><del>-        void countOSRExit() { m_osrExitCounter++; }
</del><ins>+    void countOSRExit() { m_osrExitCounter++; }
</ins><span class="cx">         
</span><del>-        uint32_t* addressOfOSRExitCounter() { return &amp;m_osrExitCounter; }
</del><ins>+    uint32_t* addressOfOSRExitCounter() { return &amp;m_osrExitCounter; }
</ins><span class="cx">         
</span><del>-        static ptrdiff_t offsetOfOSRExitCounter() { return OBJECT_OFFSETOF(CodeBlock, m_osrExitCounter); }
</del><ins>+    static ptrdiff_t offsetOfOSRExitCounter() { return OBJECT_OFFSETOF(CodeBlock, m_osrExitCounter); }
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-        uint32_t adjustedExitCountThreshold(uint32_t desiredThreshold);
-        uint32_t exitCountThresholdForReoptimization();
-        uint32_t exitCountThresholdForReoptimizationFromLoop();
-        bool shouldReoptimizeNow();
-        bool shouldReoptimizeFromLoopNow();
</del><ins>+    uint32_t adjustedExitCountThreshold(uint32_t desiredThreshold);
+    uint32_t exitCountThresholdForReoptimization();
+    uint32_t exitCountThresholdForReoptimizationFromLoop();
+    bool shouldReoptimizeNow();
+    bool shouldReoptimizeFromLoopNow();
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(VALUE_PROFILER)
</span><del>-        bool shouldOptimizeNow();
-        void updateAllValueProfilePredictions(OperationInProgress = NoOperation);
-        void updateAllArrayPredictions(OperationInProgress = NoOperation);
-        void updateAllPredictions(OperationInProgress = NoOperation);
</del><ins>+    bool shouldOptimizeNow();
+    void updateAllValueProfilePredictions(OperationInProgress = NoOperation);
+    void updateAllArrayPredictions(OperationInProgress = NoOperation);
+    void updateAllPredictions(OperationInProgress = NoOperation);
</ins><span class="cx"> #else
</span><del>-        bool updateAllPredictionsAndCheckIfShouldOptimizeNow() { return false; }
-        void updateAllValueProfilePredictions(OperationInProgress = NoOperation) { }
-        void updateAllArrayPredictions(OperationInProgress = NoOperation) { }
-        void updateAllPredictions(OperationInProgress = NoOperation) { }
</del><ins>+    bool updateAllPredictionsAndCheckIfShouldOptimizeNow() { return false; }
+    void updateAllValueProfilePredictions(OperationInProgress = NoOperation) { }
+    void updateAllArrayPredictions(OperationInProgress = NoOperation) { }
+    void updateAllPredictions(OperationInProgress = NoOperation) { }
</ins><span class="cx"> #endif
</span><span class="cx">         
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-        void reoptimize();
</del><ins>+    void reoptimize();
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(VERBOSE_VALUE_PROFILE)
</span><del>-        void dumpValueProfiles();
</del><ins>+    void dumpValueProfiles();
</ins><span class="cx"> #endif
</span><span class="cx">         
</span><del>-        // FIXME: Make these remaining members private.
</del><ins>+    // FIXME: Make these remaining members private.
</ins><span class="cx"> 
</span><del>-        int m_numCalleeRegisters;
-        int m_numVars;
-        bool m_isConstructor;
</del><ins>+    int m_numCalleeRegisters;
+    int m_numVars;
+    bool m_isConstructor;
</ins><span class="cx">         
</span><del>-        // This is intentionally public; it's the responsibility of anyone doing any
-        // of the following to hold the lock:
-        //
-        // - Modifying any inline cache in this code block.
-        //
-        // - Quering any inline cache in this code block, from a thread other than
-        //   the main thread.
-        //
-        // Additionally, it's only legal to modify the inline cache on the main
-        // thread. This means that the main thread can query the inline cache without
-        // locking. This is crucial since executing the inline cache is effectively
-        // &quot;querying&quot; it.
-        //
-        // Another exception to the rules is that the GC can do whatever it wants
-        // without holding any locks, because the GC is guaranteed to wait until any
-        // concurrent compilation threads finish what they're doing.
-        ConcurrentJITLock m_lock;
</del><ins>+    // This is intentionally public; it's the responsibility of anyone doing any
+    // of the following to hold the lock:
+    //
+    // - Modifying any inline cache in this code block.
+    //
+    // - Quering any inline cache in this code block, from a thread other than
+    //   the main thread.
+    //
+    // Additionally, it's only legal to modify the inline cache on the main
+    // thread. This means that the main thread can query the inline cache without
+    // locking. This is crucial since executing the inline cache is effectively
+    // &quot;querying&quot; it.
+    //
+    // Another exception to the rules is that the GC can do whatever it wants
+    // without holding any locks, because the GC is guaranteed to wait until any
+    // concurrent compilation threads finish what they're doing.
+    ConcurrentJITLock m_lock;
</ins><span class="cx"> 
</span><del>-    protected:
</del><ins>+protected:
</ins><span class="cx"> #if ENABLE(JIT)
</span><del>-        virtual CompilationResult jitCompileImpl(ExecState*) = 0;
</del><ins>+    virtual CompilationResult jitCompileImpl(ExecState*) = 0;
</ins><span class="cx"> #endif
</span><del>-        virtual void visitWeakReferences(SlotVisitor&amp;);
-        virtual void finalizeUnconditionally();
</del><ins>+    virtual void visitWeakReferences(SlotVisitor&amp;);
+    virtual void finalizeUnconditionally();
</ins><span class="cx"> 
</span><del>-    private:
-        friend class DFGCodeBlocks;
</del><ins>+private:
+    friend class DFGCodeBlocks;
</ins><span class="cx">         
</span><del>-        double optimizationThresholdScalingFactor();
</del><ins>+    double optimizationThresholdScalingFactor();
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-        ClosureCallStubRoutine* findClosureCallForReturnPC(ReturnAddressPtr);
</del><ins>+    ClosureCallStubRoutine* findClosureCallForReturnPC(ReturnAddressPtr);
</ins><span class="cx"> #endif
</span><span class="cx">         
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-        void tallyFrequentExitSites();
</del><ins>+    void tallyFrequentExitSites();
</ins><span class="cx"> #else
</span><del>-        void tallyFrequentExitSites() { }
</del><ins>+    void tallyFrequentExitSites() { }
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VALUE_PROFILER)
</span><del>-        void updateAllPredictionsAndCountLiveness(OperationInProgress, unsigned&amp; numberOfLiveNonArgumentValueProfiles, unsigned&amp; numberOfSamplesInProfiles);
</del><ins>+    void updateAllPredictionsAndCountLiveness(OperationInProgress, unsigned&amp; numberOfLiveNonArgumentValueProfiles, unsigned&amp; numberOfSamplesInProfiles);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        void setIdentifiers(const Vector&lt;Identifier&gt;&amp; identifiers)
-        {
-            RELEASE_ASSERT(m_identifiers.isEmpty());
-            m_identifiers.appendVector(identifiers);
-        }
</del><ins>+    void setIdentifiers(const Vector&lt;Identifier&gt;&amp; identifiers)
+    {
+        RELEASE_ASSERT(m_identifiers.isEmpty());
+        m_identifiers.appendVector(identifiers);
+    }
</ins><span class="cx"> 
</span><del>-        void setConstantRegisters(const Vector&lt;WriteBarrier&lt;Unknown&gt; &gt;&amp; constants)
-        {
-            size_t count = constants.size();
-            m_constantRegisters.resize(count);
-            for (size_t i = 0; i &lt; count; i++)
-                m_constantRegisters[i].set(*m_vm, ownerExecutable(), constants[i].get());
-        }
</del><ins>+    void setConstantRegisters(const Vector&lt;WriteBarrier&lt;Unknown&gt; &gt;&amp; constants)
+    {
+        size_t count = constants.size();
+        m_constantRegisters.resize(count);
+        for (size_t i = 0; i &lt; count; i++)
+            m_constantRegisters[i].set(*m_vm, ownerExecutable(), constants[i].get());
+    }
</ins><span class="cx"> 
</span><del>-        void dumpBytecode(PrintStream&amp;, ExecState*, const Instruction* begin, const Instruction*&amp;);
</del><ins>+    void dumpBytecode(PrintStream&amp;, ExecState*, const Instruction* begin, const Instruction*&amp;);
</ins><span class="cx"> 
</span><del>-        CString registerName(int r) const;
-        void printUnaryOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;, const char* op);
-        void printBinaryOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;, const char* op);
-        void printConditionalJump(PrintStream&amp;, ExecState*, const Instruction*, const Instruction*&amp;, int location, const char* op);
-        void printGetByIdOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;);
-        void printGetByIdCacheStatus(PrintStream&amp;, ExecState*, int location);
-        enum CacheDumpMode { DumpCaches, DontDumpCaches };
-        void printCallOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;, const char* op, CacheDumpMode);
-        void printPutByIdOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;, const char* op);
-        void beginDumpProfiling(PrintStream&amp;, bool&amp; hasPrintedProfiling);
-        void dumpValueProfiling(PrintStream&amp;, const Instruction*&amp;, bool&amp; hasPrintedProfiling);
-        void dumpArrayProfiling(PrintStream&amp;, const Instruction*&amp;, bool&amp; hasPrintedProfiling);
</del><ins>+    CString registerName(int r) const;
+    void printUnaryOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;, const char* op);
+    void printBinaryOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;, const char* op);
+    void printConditionalJump(PrintStream&amp;, ExecState*, const Instruction*, const Instruction*&amp;, int location, const char* op);
+    void printGetByIdOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;);
+    void printGetByIdCacheStatus(PrintStream&amp;, ExecState*, int location);
+    enum CacheDumpMode { DumpCaches, DontDumpCaches };
+    void printCallOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;, const char* op, CacheDumpMode);
+    void printPutByIdOp(PrintStream&amp;, ExecState*, int location, const Instruction*&amp;, const char* op);
+    void beginDumpProfiling(PrintStream&amp;, bool&amp; hasPrintedProfiling);
+    void dumpValueProfiling(PrintStream&amp;, const Instruction*&amp;, bool&amp; hasPrintedProfiling);
+    void dumpArrayProfiling(PrintStream&amp;, const Instruction*&amp;, bool&amp; hasPrintedProfiling);
</ins><span class="cx"> #if ENABLE(VALUE_PROFILER)
</span><del>-        void dumpRareCaseProfile(PrintStream&amp;, const char* name, RareCaseProfile*, bool&amp; hasPrintedProfiling);
</del><ins>+    void dumpRareCaseProfile(PrintStream&amp;, const char* name, RareCaseProfile*, bool&amp; hasPrintedProfiling);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-        void visitStructures(SlotVisitor&amp;, Instruction* vPC);
</del><ins>+    void visitStructures(SlotVisitor&amp;, Instruction* vPC);
</ins><span class="cx">         
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-        bool shouldImmediatelyAssumeLivenessDuringScan()
-        {
-            // Null m_dfgData means that this is a baseline JIT CodeBlock. Baseline JIT
-            // CodeBlocks don't need to be jettisoned when their weak references go
-            // stale. So if a basline JIT CodeBlock gets scanned, we can assume that
-            // this means that it's live.
-            if (!JITCode::isOptimizingJIT(jitType()))
-                return true;
</del><ins>+    bool shouldImmediatelyAssumeLivenessDuringScan()
+    {
+        // Null m_dfgData means that this is a baseline JIT CodeBlock. Baseline JIT
+        // CodeBlocks don't need to be jettisoned when their weak references go
+        // stale. So if a basline JIT CodeBlock gets scanned, we can assume that
+        // this means that it's live.
+        if (!JITCode::isOptimizingJIT(jitType()))
+            return true;
</ins><span class="cx">             
</span><del>-            // For simplicity, we don't attempt to jettison code blocks during GC if
-            // they are executing. Instead we strongly mark their weak references to
-            // allow them to continue to execute soundly.
-            if (m_jitCode-&gt;dfgCommon()-&gt;mayBeExecuting)
-                return true;
</del><ins>+        // For simplicity, we don't attempt to jettison code blocks during GC if
+        // they are executing. Instead we strongly mark their weak references to
+        // allow them to continue to execute soundly.
+        if (m_jitCode-&gt;dfgCommon()-&gt;mayBeExecuting)
+            return true;
</ins><span class="cx">             
</span><del>-            if (Options::forceDFGCodeBlockLiveness())
-                return true;
</del><ins>+        if (Options::forceDFGCodeBlockLiveness())
+            return true;
</ins><span class="cx"> 
</span><del>-            return false;
-        }
</del><ins>+        return false;
+    }
</ins><span class="cx"> #else
</span><del>-        bool shouldImmediatelyAssumeLivenessDuringScan() { return true; }
</del><ins>+    bool shouldImmediatelyAssumeLivenessDuringScan() { return true; }
</ins><span class="cx"> #endif
</span><span class="cx">         
</span><del>-        void performTracingFixpointIteration(SlotVisitor&amp;);
</del><ins>+    void performTracingFixpointIteration(SlotVisitor&amp;);
</ins><span class="cx">         
</span><del>-        void stronglyVisitStrongReferences(SlotVisitor&amp;);
-        void stronglyVisitWeakReferences(SlotVisitor&amp;);
</del><ins>+    void stronglyVisitStrongReferences(SlotVisitor&amp;);
+    void stronglyVisitWeakReferences(SlotVisitor&amp;);
</ins><span class="cx"> 
</span><del>-        void createRareDataIfNecessary()
-        {
-            if (!m_rareData)
-                m_rareData = adoptPtr(new RareData);
-        }
</del><ins>+    void createRareDataIfNecessary()
+    {
+        if (!m_rareData)
+            m_rareData = adoptPtr(new RareData);
+    }
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-        void resetStubInternal(RepatchBuffer&amp;, StructureStubInfo&amp;);
</del><ins>+    void resetStubInternal(RepatchBuffer&amp;, StructureStubInfo&amp;);
</ins><span class="cx"> #endif
</span><del>-        WriteBarrier&lt;UnlinkedCodeBlock&gt; m_unlinkedCode;
-        int m_numParameters;
-        WriteBarrier&lt;ScriptExecutable&gt; m_ownerExecutable;
-        VM* m_vm;
</del><ins>+    WriteBarrier&lt;UnlinkedCodeBlock&gt; m_unlinkedCode;
+    int m_numParameters;
+    WriteBarrier&lt;ScriptExecutable&gt; m_ownerExecutable;
+    VM* m_vm;
</ins><span class="cx"> 
</span><del>-        RefCountedArray&lt;Instruction&gt; m_instructions;
-        int m_thisRegister;
-        int m_argumentsRegister;
-        int m_activationRegister;
</del><ins>+    RefCountedArray&lt;Instruction&gt; m_instructions;
+    int m_thisRegister;
+    int m_argumentsRegister;
+    int m_activationRegister;
</ins><span class="cx"> 
</span><del>-        bool m_isStrictMode;
-        bool m_needsActivation;
</del><ins>+    bool m_isStrictMode;
+    bool m_needsActivation;
</ins><span class="cx"> 
</span><del>-        RefPtr&lt;SourceProvider&gt; m_source;
-        unsigned m_sourceOffset;
-        unsigned m_codeType;
</del><ins>+    RefPtr&lt;SourceProvider&gt; m_source;
+    unsigned m_sourceOffset;
+    unsigned m_codeType;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(LLINT)
</span><del>-        SegmentedVector&lt;LLIntCallLinkInfo, 8&gt; m_llintCallLinkInfos;
-        SentinelLinkedList&lt;LLIntCallLinkInfo, BasicRawSentinelNode&lt;LLIntCallLinkInfo&gt; &gt; m_incomingLLIntCalls;
</del><ins>+    SegmentedVector&lt;LLIntCallLinkInfo, 8&gt; m_llintCallLinkInfos;
+    SentinelLinkedList&lt;LLIntCallLinkInfo, BasicRawSentinelNode&lt;LLIntCallLinkInfo&gt; &gt; m_incomingLLIntCalls;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-        Vector&lt;StructureStubInfo&gt; m_structureStubInfos;
-        Vector&lt;ByValInfo&gt; m_byValInfos;
-        Vector&lt;CallLinkInfo&gt; m_callLinkInfos;
-        RefPtr&lt;JITCode&gt; m_jitCode;
-        MacroAssemblerCodePtr m_jitCodeWithArityCheck;
-        SentinelLinkedList&lt;CallLinkInfo, BasicRawSentinelNode&lt;CallLinkInfo&gt; &gt; m_incomingCalls;
</del><ins>+    Vector&lt;StructureStubInfo&gt; m_structureStubInfos;
+    Vector&lt;ByValInfo&gt; m_byValInfos;
+    Vector&lt;CallLinkInfo&gt; m_callLinkInfos;
+    RefPtr&lt;JITCode&gt; m_jitCode;
+    MacroAssemblerCodePtr m_jitCodeWithArityCheck;
+    SentinelLinkedList&lt;CallLinkInfo, BasicRawSentinelNode&lt;CallLinkInfo&gt; &gt; m_incomingCalls;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(DFG_JIT) || ENABLE(LLINT)
</span><del>-        OwnPtr&lt;CompactJITCodeMap&gt; m_jitCodeMap;
</del><ins>+    OwnPtr&lt;CompactJITCodeMap&gt; m_jitCodeMap;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-        // This is relevant to non-DFG code blocks that serve as the profiled code block
-        // for DFG code blocks.
-        DFG::ExitProfile m_exitProfile;
-        CompressedLazyOperandValueProfileHolder m_lazyOperandValueProfiles;
</del><ins>+    // This is relevant to non-DFG code blocks that serve as the profiled code block
+    // for DFG code blocks.
+    DFG::ExitProfile m_exitProfile;
+    CompressedLazyOperandValueProfileHolder m_lazyOperandValueProfiles;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(VALUE_PROFILER)
</span><del>-        Vector&lt;ValueProfile&gt; m_argumentValueProfiles;
-        SegmentedVector&lt;ValueProfile, 8&gt; m_valueProfiles;
-        SegmentedVector&lt;RareCaseProfile, 8&gt; m_rareCaseProfiles;
-        SegmentedVector&lt;RareCaseProfile, 8&gt; m_specialFastCaseProfiles;
-        SegmentedVector&lt;ArrayAllocationProfile, 8&gt; m_arrayAllocationProfiles;
-        ArrayProfileVector m_arrayProfiles;
</del><ins>+    Vector&lt;ValueProfile&gt; m_argumentValueProfiles;
+    SegmentedVector&lt;ValueProfile, 8&gt; m_valueProfiles;
+    SegmentedVector&lt;RareCaseProfile, 8&gt; m_rareCaseProfiles;
+    SegmentedVector&lt;RareCaseProfile, 8&gt; m_specialFastCaseProfiles;
+    SegmentedVector&lt;ArrayAllocationProfile, 8&gt; m_arrayAllocationProfiles;
+    ArrayProfileVector m_arrayProfiles;
</ins><span class="cx"> #endif
</span><del>-        SegmentedVector&lt;ObjectAllocationProfile, 8&gt; m_objectAllocationProfiles;
</del><ins>+    SegmentedVector&lt;ObjectAllocationProfile, 8&gt; m_objectAllocationProfiles;
</ins><span class="cx"> 
</span><del>-        // Constant Pool
-        Vector&lt;Identifier&gt; m_identifiers;
-        COMPILE_ASSERT(sizeof(Register) == sizeof(WriteBarrier&lt;Unknown&gt;), Register_must_be_same_size_as_WriteBarrier_Unknown);
-        // TODO: This could just be a pointer to m_unlinkedCodeBlock's data, but the DFG mutates
-        // it, so we're stuck with it for now.
-        Vector&lt;WriteBarrier&lt;Unknown&gt; &gt; m_constantRegisters;
-        Vector&lt;WriteBarrier&lt;FunctionExecutable&gt; &gt; m_functionDecls;
-        Vector&lt;WriteBarrier&lt;FunctionExecutable&gt; &gt; m_functionExprs;
</del><ins>+    // Constant Pool
+    Vector&lt;Identifier&gt; m_identifiers;
+    COMPILE_ASSERT(sizeof(Register) == sizeof(WriteBarrier&lt;Unknown&gt;), Register_must_be_same_size_as_WriteBarrier_Unknown);
+    // TODO: This could just be a pointer to m_unlinkedCodeBlock's data, but the DFG mutates
+    // it, so we're stuck with it for now.
+    Vector&lt;WriteBarrier&lt;Unknown&gt; &gt; m_constantRegisters;
+    Vector&lt;WriteBarrier&lt;FunctionExecutable&gt; &gt; m_functionDecls;
+    Vector&lt;WriteBarrier&lt;FunctionExecutable&gt; &gt; m_functionExprs;
</ins><span class="cx"> 
</span><del>-        RefPtr&lt;CodeBlock&gt; m_alternative;
</del><ins>+    RefPtr&lt;CodeBlock&gt; m_alternative;
</ins><span class="cx">         
</span><del>-        ExecutionCounter m_llintExecuteCounter;
</del><ins>+    ExecutionCounter m_llintExecuteCounter;
</ins><span class="cx">         
</span><del>-        ExecutionCounter m_jitExecuteCounter;
-        int32_t m_totalJITExecutions;
-        uint32_t m_osrExitCounter;
-        uint16_t m_optimizationDelayCounter;
-        uint16_t m_reoptimizationRetryCounter;
</del><ins>+    ExecutionCounter m_jitExecuteCounter;
+    int32_t m_totalJITExecutions;
+    uint32_t m_osrExitCounter;
+    uint16_t m_optimizationDelayCounter;
+    uint16_t m_reoptimizationRetryCounter;
</ins><span class="cx"> 
</span><del>-        Vector&lt;ResolveOperations&gt; m_resolveOperations;
-        Vector&lt;PutToBaseOperation, 1&gt; m_putToBaseOperations;
</del><ins>+    Vector&lt;ResolveOperations&gt; m_resolveOperations;
+    Vector&lt;PutToBaseOperation, 1&gt; m_putToBaseOperations;
</ins><span class="cx"> 
</span><del>-        struct RareData {
-           WTF_MAKE_FAST_ALLOCATED;
-        public:
-            Vector&lt;HandlerInfo&gt; m_exceptionHandlers;
</del><ins>+    struct RareData {
+        WTF_MAKE_FAST_ALLOCATED;
+    public:
+        Vector&lt;HandlerInfo&gt; m_exceptionHandlers;
</ins><span class="cx"> 
</span><del>-            // Buffers used for large array literals
-            Vector&lt;Vector&lt;JSValue&gt; &gt; m_constantBuffers;
</del><ins>+        // Buffers used for large array literals
+        Vector&lt;Vector&lt;JSValue&gt; &gt; m_constantBuffers;
</ins><span class="cx">             
</span><del>-            // Jump Tables
-            Vector&lt;SimpleJumpTable&gt; m_immediateSwitchJumpTables;
-            Vector&lt;SimpleJumpTable&gt; m_characterSwitchJumpTables;
-            Vector&lt;StringJumpTable&gt; m_stringSwitchJumpTables;
</del><ins>+        // Jump Tables
+        Vector&lt;SimpleJumpTable&gt; m_immediateSwitchJumpTables;
+        Vector&lt;SimpleJumpTable&gt; m_characterSwitchJumpTables;
+        Vector&lt;StringJumpTable&gt; m_stringSwitchJumpTables;
</ins><span class="cx"> 
</span><del>-            EvalCodeCache m_evalCodeCache;
</del><ins>+        EvalCodeCache m_evalCodeCache;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-            Vector&lt;CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow&gt; m_callReturnIndexVector;
</del><ins>+        Vector&lt;CallReturnOffsetToBytecodeOffset, 0, UnsafeVectorOverflow&gt; m_callReturnIndexVector;
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-            SegmentedVector&lt;InlineCallFrame, 4&gt; m_inlineCallFrames;
-            Vector&lt;CodeOriginAtCallReturnOffset, 0, UnsafeVectorOverflow&gt; m_codeOrigins;
</del><ins>+        SegmentedVector&lt;InlineCallFrame, 4&gt; m_inlineCallFrames;
+        Vector&lt;CodeOriginAtCallReturnOffset, 0, UnsafeVectorOverflow&gt; m_codeOrigins;
</ins><span class="cx"> #endif
</span><del>-        };
</del><ins>+    };
</ins><span class="cx"> #if COMPILER(MSVC)
</span><del>-        friend void WTF::deleteOwnedPtr&lt;RareData&gt;(RareData*);
</del><ins>+    friend void WTF::deleteOwnedPtr&lt;RareData&gt;(RareData*);
</ins><span class="cx"> #endif
</span><del>-        OwnPtr&lt;RareData&gt; m_rareData;
</del><ins>+    OwnPtr&lt;RareData&gt; m_rareData;
</ins><span class="cx"> #if ENABLE(JIT)
</span><del>-        DFG::CapabilityLevel m_canCompileWithDFGState;
</del><ins>+    DFG::CapabilityLevel m_canCompileWithDFGState;
</ins><span class="cx"> #endif
</span><del>-    };
</del><ins>+};
</ins><span class="cx"> 
</span><del>-    // Program code is not marked by any function, so we make the global object
-    // responsible for marking it.
</del><ins>+// Program code is not marked by any function, so we make the global object
+// responsible for marking it.
</ins><span class="cx"> 
</span><del>-    class GlobalCodeBlock : public CodeBlock {
-    protected:
-        GlobalCodeBlock(CopyParsedBlockTag, GlobalCodeBlock&amp; other)
-            : CodeBlock(CopyParsedBlock, other)
-        {
-        }
</del><ins>+class GlobalCodeBlock : public CodeBlock {
+protected:
+    GlobalCodeBlock(CopyParsedBlockTag, GlobalCodeBlock&amp; other)
+        : CodeBlock(CopyParsedBlock, other)
+    {
+    }
</ins><span class="cx">         
</span><del>-        GlobalCodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, unsigned baseScopeDepth, PassRefPtr&lt;SourceProvider&gt; sourceProvider, unsigned sourceOffset)
-            : CodeBlock(ownerExecutable, unlinkedCodeBlock, globalObject, baseScopeDepth, sourceProvider, sourceOffset)
-        {
-        }
-    };
</del><ins>+    GlobalCodeBlock(ScriptExecutable* ownerExecutable, UnlinkedCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, unsigned baseScopeDepth, PassRefPtr&lt;SourceProvider&gt; sourceProvider, unsigned sourceOffset)
+        : CodeBlock(ownerExecutable, unlinkedCodeBlock, globalObject, baseScopeDepth, sourceProvider, sourceOffset)
+    {
+    }
+};
</ins><span class="cx"> 
</span><del>-    class ProgramCodeBlock : public GlobalCodeBlock {
-    public:
-        ProgramCodeBlock(CopyParsedBlockTag, ProgramCodeBlock&amp; other)
-            : GlobalCodeBlock(CopyParsedBlock, other)
-        {
-        }
</del><ins>+class ProgramCodeBlock : public GlobalCodeBlock {
+public:
+    ProgramCodeBlock(CopyParsedBlockTag, ProgramCodeBlock&amp; other)
+        : GlobalCodeBlock(CopyParsedBlock, other)
+    {
+    }
</ins><span class="cx"> 
</span><del>-        ProgramCodeBlock(ProgramExecutable* ownerExecutable, UnlinkedProgramCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, PassRefPtr&lt;SourceProvider&gt; sourceProvider)
-            : GlobalCodeBlock(ownerExecutable, unlinkedCodeBlock, globalObject, 0, sourceProvider, 0)
-        {
-        }
</del><ins>+    ProgramCodeBlock(ProgramExecutable* ownerExecutable, UnlinkedProgramCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, PassRefPtr&lt;SourceProvider&gt; sourceProvider)
+        : GlobalCodeBlock(ownerExecutable, unlinkedCodeBlock, globalObject, 0, sourceProvider, 0)
+    {
+    }
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-    protected:
-        virtual JSObject* compileOptimized(ExecState*, JSScope*, CompilationResult&amp;, unsigned bytecodeIndex);
-        virtual CompilationResult replaceWithDeferredOptimizedCode(PassRefPtr&lt;DFG::Plan&gt;);
-        virtual void jettison();
-        virtual CompilationResult jitCompileImpl(ExecState*);
-        virtual CodeBlock* replacement();
-        virtual DFG::CapabilityLevel canCompileWithDFGInternal();
</del><ins>+protected:
+    virtual JSObject* compileOptimized(ExecState*, JSScope*, CompilationResult&amp;, unsigned bytecodeIndex);
+    virtual CompilationResult replaceWithDeferredOptimizedCode(PassRefPtr&lt;DFG::Plan&gt;);
+    virtual void jettison();
+    virtual CompilationResult jitCompileImpl(ExecState*);
+    virtual CodeBlock* replacement();
+    virtual DFG::CapabilityLevel canCompileWithDFGInternal();
</ins><span class="cx"> #endif
</span><del>-    };
</del><ins>+};
</ins><span class="cx"> 
</span><del>-    class EvalCodeBlock : public GlobalCodeBlock {
-    public:
-        EvalCodeBlock(CopyParsedBlockTag, EvalCodeBlock&amp; other)
-            : GlobalCodeBlock(CopyParsedBlock, other)
-        {
-        }
</del><ins>+class EvalCodeBlock : public GlobalCodeBlock {
+public:
+    EvalCodeBlock(CopyParsedBlockTag, EvalCodeBlock&amp; other)
+        : GlobalCodeBlock(CopyParsedBlock, other)
+    {
+    }
</ins><span class="cx">         
</span><del>-        EvalCodeBlock(EvalExecutable* ownerExecutable, UnlinkedEvalCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, PassRefPtr&lt;SourceProvider&gt; sourceProvider, int baseScopeDepth)
-            : GlobalCodeBlock(ownerExecutable, unlinkedCodeBlock, globalObject, baseScopeDepth, sourceProvider, 0)
-        {
-        }
</del><ins>+    EvalCodeBlock(EvalExecutable* ownerExecutable, UnlinkedEvalCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, PassRefPtr&lt;SourceProvider&gt; sourceProvider, int baseScopeDepth)
+        : GlobalCodeBlock(ownerExecutable, unlinkedCodeBlock, globalObject, baseScopeDepth, sourceProvider, 0)
+    {
+    }
</ins><span class="cx"> 
</span><del>-        const Identifier&amp; variable(unsigned index) { return unlinkedEvalCodeBlock()-&gt;variable(index); }
-        unsigned numVariables() { return unlinkedEvalCodeBlock()-&gt;numVariables(); }
</del><ins>+    const Identifier&amp; variable(unsigned index) { return unlinkedEvalCodeBlock()-&gt;variable(index); }
+    unsigned numVariables() { return unlinkedEvalCodeBlock()-&gt;numVariables(); }
</ins><span class="cx">         
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-    protected:
-        virtual JSObject* compileOptimized(ExecState*, JSScope*, CompilationResult&amp;, unsigned bytecodeIndex);
-        virtual CompilationResult replaceWithDeferredOptimizedCode(PassRefPtr&lt;DFG::Plan&gt;);
-        virtual void jettison();
-        virtual CompilationResult jitCompileImpl(ExecState*);
-        virtual CodeBlock* replacement();
-        virtual DFG::CapabilityLevel canCompileWithDFGInternal();
</del><ins>+protected:
+    virtual JSObject* compileOptimized(ExecState*, JSScope*, CompilationResult&amp;, unsigned bytecodeIndex);
+    virtual CompilationResult replaceWithDeferredOptimizedCode(PassRefPtr&lt;DFG::Plan&gt;);
+    virtual void jettison();
+    virtual CompilationResult jitCompileImpl(ExecState*);
+    virtual CodeBlock* replacement();
+    virtual DFG::CapabilityLevel canCompileWithDFGInternal();
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    private:
-        UnlinkedEvalCodeBlock* unlinkedEvalCodeBlock() const { return jsCast&lt;UnlinkedEvalCodeBlock*&gt;(unlinkedCodeBlock()); }
-    };
</del><ins>+private:
+    UnlinkedEvalCodeBlock* unlinkedEvalCodeBlock() const { return jsCast&lt;UnlinkedEvalCodeBlock*&gt;(unlinkedCodeBlock()); }
+};
</ins><span class="cx"> 
</span><del>-    class FunctionCodeBlock : public CodeBlock {
-    public:
-        FunctionCodeBlock(CopyParsedBlockTag, FunctionCodeBlock&amp; other)
-            : CodeBlock(CopyParsedBlock, other)
-        {
-        }
</del><ins>+class FunctionCodeBlock : public CodeBlock {
+public:
+    FunctionCodeBlock(CopyParsedBlockTag, FunctionCodeBlock&amp; other)
+        : CodeBlock(CopyParsedBlock, other)
+    {
+    }
</ins><span class="cx"> 
</span><del>-        FunctionCodeBlock(FunctionExecutable* ownerExecutable, UnlinkedFunctionCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, PassRefPtr&lt;SourceProvider&gt; sourceProvider, unsigned sourceOffset)
-            : CodeBlock(ownerExecutable, unlinkedCodeBlock, globalObject, 0, sourceProvider, sourceOffset)
-        {
-        }
</del><ins>+    FunctionCodeBlock(FunctionExecutable* ownerExecutable, UnlinkedFunctionCodeBlock* unlinkedCodeBlock, JSGlobalObject* globalObject, PassRefPtr&lt;SourceProvider&gt; sourceProvider, unsigned sourceOffset)
+        : CodeBlock(ownerExecutable, unlinkedCodeBlock, globalObject, 0, sourceProvider, sourceOffset)
+    {
+    }
</ins><span class="cx">         
</span><span class="cx"> #if ENABLE(JIT)
</span><del>-    protected:
-        virtual JSObject* compileOptimized(ExecState*, JSScope*, CompilationResult&amp;, unsigned bytecodeIndex);
-        virtual CompilationResult replaceWithDeferredOptimizedCode(PassRefPtr&lt;DFG::Plan&gt;);
-        virtual void jettison();
-        virtual CompilationResult jitCompileImpl(ExecState*);
-        virtual CodeBlock* replacement();
-        virtual DFG::CapabilityLevel canCompileWithDFGInternal();
</del><ins>+protected:
+    virtual JSObject* compileOptimized(ExecState*, JSScope*, CompilationResult&amp;, unsigned bytecodeIndex);
+    virtual CompilationResult replaceWithDeferredOptimizedCode(PassRefPtr&lt;DFG::Plan&gt;);
+    virtual void jettison();
+    virtual CompilationResult jitCompileImpl(ExecState*);
+    virtual CodeBlock* replacement();
+    virtual DFG::CapabilityLevel canCompileWithDFGInternal();
</ins><span class="cx"> #endif
</span><del>-    };
</del><ins>+};
</ins><span class="cx"> 
</span><del>-    inline CodeBlock* baselineCodeBlockForInlineCallFrame(InlineCallFrame* inlineCallFrame)
-    {
-        RELEASE_ASSERT(inlineCallFrame);
-        ExecutableBase* executable = inlineCallFrame-&gt;executable.get();
-        RELEASE_ASSERT(executable-&gt;structure()-&gt;classInfo() == &amp;FunctionExecutable::s_info);
-        return static_cast&lt;FunctionExecutable*&gt;(executable)-&gt;baselineCodeBlockFor(inlineCallFrame-&gt;isCall ? CodeForCall : CodeForConstruct);
-    }
</del><ins>+inline CodeBlock* baselineCodeBlockForInlineCallFrame(InlineCallFrame* inlineCallFrame)
+{
+    RELEASE_ASSERT(inlineCallFrame);
+    ExecutableBase* executable = inlineCallFrame-&gt;executable.get();
+    RELEASE_ASSERT(executable-&gt;structure()-&gt;classInfo() == &amp;FunctionExecutable::s_info);
+    return static_cast&lt;FunctionExecutable*&gt;(executable)-&gt;baselineCodeBlockFor(inlineCallFrame-&gt;isCall ? CodeForCall : CodeForConstruct);
+}
</ins><span class="cx">     
</span><del>-    inline CodeBlock* baselineCodeBlockForOriginAndBaselineCodeBlock(const CodeOrigin&amp; codeOrigin, CodeBlock* baselineCodeBlock)
-    {
-        if (codeOrigin.inlineCallFrame)
-            return baselineCodeBlockForInlineCallFrame(codeOrigin.inlineCallFrame);
-        return baselineCodeBlock;
-    }
</del><ins>+inline CodeBlock* baselineCodeBlockForOriginAndBaselineCodeBlock(const CodeOrigin&amp; codeOrigin, CodeBlock* baselineCodeBlock)
+{
+    if (codeOrigin.inlineCallFrame)
+        return baselineCodeBlockForInlineCallFrame(codeOrigin.inlineCallFrame);
+    return baselineCodeBlock;
+}
</ins><span class="cx"> 
</span><del>-    inline int CodeBlock::argumentIndexAfterCapture(size_t argument)
-    {
-        if (argument &gt;= static_cast&lt;size_t&gt;(symbolTable()-&gt;parameterCount()))
-            return CallFrame::argumentOffset(argument);
</del><ins>+inline int CodeBlock::argumentIndexAfterCapture(size_t argument)
+{
+    if (argument &gt;= static_cast&lt;size_t&gt;(symbolTable()-&gt;parameterCount()))
+        return CallFrame::argumentOffset(argument);
</ins><span class="cx"> 
</span><del>-        const SlowArgument* slowArguments = symbolTable()-&gt;slowArguments();
-        if (!slowArguments || slowArguments[argument].status == SlowArgument::Normal)
-            return CallFrame::argumentOffset(argument);
</del><ins>+    const SlowArgument* slowArguments = symbolTable()-&gt;slowArguments();
+    if (!slowArguments || slowArguments[argument].status == SlowArgument::Normal)
+        return CallFrame::argumentOffset(argument);
</ins><span class="cx"> 
</span><del>-        ASSERT(slowArguments[argument].status == SlowArgument::Captured);
-        return slowArguments[argument].index;
-    }
</del><ins>+    ASSERT(slowArguments[argument].status == SlowArgument::Captured);
+    return slowArguments[argument].index;
+}
</ins><span class="cx"> 
</span><del>-    inline Register&amp; ExecState::r(int index)
-    {
-        CodeBlock* codeBlock = this-&gt;codeBlock();
-        if (codeBlock-&gt;isConstantRegisterIndex(index))
-            return *reinterpret_cast&lt;Register*&gt;(&amp;codeBlock-&gt;constantRegister(index));
-        return this[index];
-    }
</del><ins>+inline Register&amp; ExecState::r(int index)
+{
+    CodeBlock* codeBlock = this-&gt;codeBlock();
+    if (codeBlock-&gt;isConstantRegisterIndex(index))
+        return *reinterpret_cast&lt;Register*&gt;(&amp;codeBlock-&gt;constantRegister(index));
+    return this[index];
+}
</ins><span class="cx"> 
</span><del>-    inline Register&amp; ExecState::uncheckedR(int index)
-    {
-        RELEASE_ASSERT(index &lt; FirstConstantRegisterIndex);
-        return this[index];
-    }
</del><ins>+inline Register&amp; ExecState::uncheckedR(int index)
+{
+    RELEASE_ASSERT(index &lt; FirstConstantRegisterIndex);
+    return this[index];
+}
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-    inline bool ExecState::isInlineCallFrame()
-    {
-        if (LIKELY(!codeBlock() || !JITCode::isOptimizingJIT(codeBlock()-&gt;jitType())))
-            return false;
-        return isInlineCallFrameSlow();
-    }
</del><ins>+inline bool ExecState::isInlineCallFrame()
+{
+    if (LIKELY(!codeBlock() || !JITCode::isOptimizingJIT(codeBlock()-&gt;jitType())))
+        return false;
+    return isInlineCallFrameSlow();
+}
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    inline JSValue ExecState::argumentAfterCapture(size_t argument)
-    {
-        if (argument &gt;= argumentCount())
-             return jsUndefined();
</del><ins>+inline JSValue ExecState::argumentAfterCapture(size_t argument)
+{
+    if (argument &gt;= argumentCount())
+        return jsUndefined();
</ins><span class="cx"> 
</span><del>-        if (!codeBlock())
-            return this[argumentOffset(argument)].jsValue();
</del><ins>+    if (!codeBlock())
+        return this[argumentOffset(argument)].jsValue();
</ins><span class="cx"> 
</span><del>-        return this[codeBlock()-&gt;argumentIndexAfterCapture(argument)].jsValue();
-    }
</del><ins>+    return this[codeBlock()-&gt;argumentIndexAfterCapture(argument)].jsValue();
+}
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>-    inline void DFGCodeBlocks::mark(void* candidateCodeBlock)
-    {
-        // We have to check for 0 and -1 because those are used by the HashMap as markers.
-        uintptr_t value = reinterpret_cast&lt;uintptr_t&gt;(candidateCodeBlock);
</del><ins>+inline void DFGCodeBlocks::mark(void* candidateCodeBlock)
+{
+    // We have to check for 0 and -1 because those are used by the HashMap as markers.
+    uintptr_t value = reinterpret_cast&lt;uintptr_t&gt;(candidateCodeBlock);
</ins><span class="cx">         
</span><del>-        // This checks for both of those nasty cases in one go.
-        // 0 + 1 = 1
-        // -1 + 1 = 0
-        if (value + 1 &lt;= 1)
-            return;
</del><ins>+    // This checks for both of those nasty cases in one go.
+    // 0 + 1 = 1
+    // -1 + 1 = 0
+    if (value + 1 &lt;= 1)
+        return;
</ins><span class="cx">         
</span><del>-        HashSet&lt;CodeBlock*&gt;::iterator iter = m_set.find(static_cast&lt;CodeBlock*&gt;(candidateCodeBlock));
-        if (iter == m_set.end())
-            return;
</del><ins>+    HashSet&lt;CodeBlock*&gt;::iterator iter = m_set.find(static_cast&lt;CodeBlock*&gt;(candidateCodeBlock));
+    if (iter == m_set.end())
+        return;
</ins><span class="cx">         
</span><del>-        (*iter)-&gt;m_jitCode-&gt;dfgCommon()-&gt;mayBeExecuting = true;
-    }
</del><ins>+    (*iter)-&gt;m_jitCode-&gt;dfgCommon()-&gt;mayBeExecuting = true;
+}
</ins><span class="cx"> #endif
</span><span class="cx">     
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>

</body>
</html>