Changeset 163027 in webkit for trunk/Source/JavaScriptCore/dfg/DFGJITFinalizer.cpp

Timestamp:

Jan 29, 2014, 11:18:54 AM (11 years ago)

Author:

[email protected]

Message:

Merge the jsCStack branch
​https://bugs.webkit.org/show_bug.cgi?id=127763

Reviewed by Mark Hahnenberg.

Source/JavaScriptCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WebCore:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

Source/WTF:

Changes from ​http://svn.webkit.org/repository/webkit/branches/jsCStack
up to changeset 162958.

File:

• trunk/Source/JavaScriptCore/dfg/DFGJITFinalizer.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGJITFinalizer.cpp

@@ -47 +47 @@
 }
 
+size_t JITFinalizer::codeSize()
+{
+    return m_linkBuffer->size();
+}
+
 bool JITFinalizer::finalize()
 {
-    m_jitCode->initializeCodeRef(m_linkBuffer->finalizeCodeWithoutDisassembly());
-    m_plan.codeBlock->setJITCode(m_jitCode, MacroAssemblerCodePtr());
+    m_jitCode->initializeCodeRef(
+        m_linkBuffer->finalizeCodeWithoutDisassembly(), MacroAssemblerCodePtr());
+    m_plan.codeBlock->setJITCode(m_jitCode);
     
     finalizeCommon();
@@ -60 +66 @@
 {
     RELEASE_ASSERT(!m_withArityCheck.isEmptyValue());
-    m_jitCode->initializeCodeRef(m_linkBuffer->finalizeCodeWithoutDisassembly());
-    m_plan.codeBlock->setJITCode(m_jitCode, m_withArityCheck);
+    m_jitCode->initializeCodeRef(
+        m_linkBuffer->finalizeCodeWithoutDisassembly(), m_withArityCheck);
+    m_plan.codeBlock->setJITCode(m_jitCode);
     
     finalizeCommon();
@@ -76 +83 @@
     if (m_plan.compilation)
         m_plan.vm.m_perBytecodeProfiler->addCompilation(m_plan.compilation);
+    
+    if (!m_plan.willTryToTierUp)
+        m_plan.codeBlock->baselineVersion()->m_didFailFTLCompilation = true;
 }