Title: [153015] branches/safari-537-branch/Source/_javascript_Core
Revision
153015
Author
[email protected]
Date
2013-07-22 17:51:33 -0700 (Mon, 22 Jul 2013)

Log Message

Merged r152882.  <rdar://problem/14488577>

Modified Paths

Diff

Modified: branches/safari-537-branch/Source/_javascript_Core/ChangeLog (153014 => 153015)


--- branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-07-23 00:14:59 UTC (rev 153014)
+++ branches/safari-537-branch/Source/_javascript_Core/ChangeLog	2013-07-23 00:51:33 UTC (rev 153015)
@@ -1,5 +1,27 @@
 2013-07-22  Lucas Forschler  <[email protected]>
 
+        Merge r152882
+
+    2013-07-18  Andreas Kling  <[email protected]>
+
+            CodeBlock DFG entry list isn't getting shrunk-to-fit after linking.
+            <http://webkit.org/b/118875>
+            <rdar://problem/14488577>
+
+            Reviewed by Geoffrey Garen.
+
+            Move the CodeBlock::shrinkToFit() call out of JITCompiler::link() and to the call sites
+            so SpeculativeJIT::linkOSREntries() can fill in CodeBlock::m_dfgData->osrEntry first.
+
+            886 kB progression on <http://twitter.com/awesomekling>
+
+            * dfg/DFGJITCompiler.cpp:
+            (JSC::DFG::JITCompiler::link):
+            (JSC::DFG::JITCompiler::compile):
+            (JSC::DFG::JITCompiler::compileFunction):
+
+2013-07-22  Lucas Forschler  <[email protected]>
+
         Merge r152868
 
     2013-07-18  Filip Pizlo  <[email protected]>

Modified: branches/safari-537-branch/Source/_javascript_Core/dfg/DFGJITCompiler.cpp (153014 => 153015)


--- branches/safari-537-branch/Source/_javascript_Core/dfg/DFGJITCompiler.cpp	2013-07-23 00:14:59 UTC (rev 153014)
+++ branches/safari-537-branch/Source/_javascript_Core/dfg/DFGJITCompiler.cpp	2013-07-23 00:51:33 UTC (rev 153015)
@@ -236,8 +236,6 @@
         ASSERT(!m_exitSiteLabels.size());
     
     codeBlock()->saveCompilation(m_graph.m_compilation);
-    
-    codeBlock()->shrinkToFit(CodeBlock::LateShrink);
 }
 
 bool JITCompiler::compile(JITCode& entry)
@@ -265,6 +263,7 @@
         return false;
     link(linkBuffer);
     speculative.linkOSREntries(linkBuffer);
+    codeBlock()->shrinkToFit(CodeBlock::LateShrink);
 
     if (shouldShowDisassembly())
         m_disassembler->dump(linkBuffer);
@@ -354,6 +353,7 @@
         return false;
     link(linkBuffer);
     speculative.linkOSREntries(linkBuffer);
+    codeBlock()->shrinkToFit(CodeBlock::LateShrink);
     
     // FIXME: switch the stack check & arity check over to DFGOpertaion style calls, not JIT stubs.
     linkBuffer.link(callStackCheck, cti_stack_check);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to