Changeset 120989 in webkit for trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

Timestamp:

Jun 21, 2012, 6:33:30 PM (13 years ago)

Author:

[email protected]

Message:

op_resolve_global should not prevent DFG inlining
​https://bugs.webkit.org/show_bug.cgi?id=89726

Reviewed by Gavin Barraclough.

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::shrinkToFit):

• bytecode/GlobalResolveInfo.h:

(JSC::GlobalResolveInfo::GlobalResolveInfo):
(GlobalResolveInfo):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::InlineStackEntry::InlineStackEntry):

• dfg/DFGCapabilities.h:

(JSC::DFG::canInlineOpcode):

• dfg/DFGOperations.cpp:
• dfg/DFGOperations.h:
• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::callOperation):

• dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

File:

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

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1584 +1584 @@
     , m_sourceOffset(other.m_sourceOffset)
 #if ENABLE(JIT)
-    , m_globalResolveInfos(other.m_globalResolveInfos)
+    , m_globalResolveInfos(other.m_globalResolveInfos.size())
 #endif
 #if ENABLE(VALUE_PROFILER)
@@ -1609 +1609 @@
     optimizeAfterWarmUp();
     jitAfterWarmUp();
+
+#if ENABLE(JIT)
+    for (unsigned i = m_globalResolveInfos.size(); i--;)
+        m_globalResolveInfos[i] = GlobalResolveInfo(other.m_globalResolveInfos[i].bytecodeOffset);
+#endif
 
     if (other.m_rareData) {
@@ -2274 +2279 @@
 #if ENABLE(JIT)
     m_structureStubInfos.shrinkToFit();
-    m_globalResolveInfos.shrinkToFit();
+    if (shrinkMode == EarlyShrink)
+        m_globalResolveInfos.shrinkToFit();
     m_callLinkInfos.shrinkToFit();
     m_methodCallLinkInfos.shrinkToFit();