Changeset 172961 in webkit for trunk/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp

Timestamp:

Aug 26, 2014, 9:46:10 AM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r172940.
​https://bugs.webkit.org/show_bug.cgi?id=136256

Caused assertions on fast/storage/serialized-script-
value.html, and possibly flakiness on more tests (Requested by
ap on #webkit).

Reverted changeset:

"FTL should be able to do polymorphic call inlining"
​https://bugs.webkit.org/show_bug.cgi?id=135145
​http://trac.webkit.org/changeset/172940

File:

• trunk/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp

@@ -51 +51 @@
             return false;
         
-        if (m_graph.m_profiledBlock->m_didFailFTLCompilation) {
-            removeFTLProfiling();
+        if (m_graph.m_profiledBlock->m_didFailFTLCompilation)
             return false;
-        }
         
 #if ENABLE(FTL_JIT)
         FTL::CapabilityLevel level = FTL::canCompile(m_graph);
-        if (level == FTL::CannotCompile) {
-            removeFTLProfiling();
+        if (level == FTL::CannotCompile)
             return false;
-        }
         
         if (!Options::enableOSREntryToFTL())
@@ -123 +119 @@
 #endif // ENABLE(FTL_JIT)
     }
-
-private:
-    void removeFTLProfiling()
-    {
-        for (BlockIndex blockIndex = m_graph.numBlocks(); blockIndex--;) {
-            BasicBlock* block = m_graph.block(blockIndex);
-            if (!block)
-                continue;
-            
-            for (unsigned nodeIndex = 0; nodeIndex < block->size(); ++nodeIndex) {
-                Node* node = block->at(nodeIndex);
-                switch (node->op()) {
-                case ProfiledCall:
-                    node->setOp(Call);
-                    break;
-                    
-                case ProfiledConstruct:
-                    node->setOp(Construct);
-                    break;
-                    
-                default:
-                    break;
-                }
-            }
-        }
-    }
 };