Title: [96978] trunk/Source/_javascript_Core
Revision
96978
Author
[email protected]
Date
2011-10-07 13:27:01 -0700 (Fri, 07 Oct 2011)

Log Message

2011-10-07  Oliver Hunt  <[email protected]>

        Verify that our call speculation is valid.

        Reviewed by Filip Pizlo.

        Before specialising an intrinsic we need to verify that
        we our speculation is correct.

        * dfg/DFGByteCodeParser.cpp:
        (JSC::DFG::ByteCodeParser::parseBlock):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96977 => 96978)


--- trunk/Source/_javascript_Core/ChangeLog	2011-10-07 20:24:33 UTC (rev 96977)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-10-07 20:27:01 UTC (rev 96978)
@@ -1,3 +1,15 @@
+2011-10-07  Oliver Hunt  <[email protected]>
+
+        Verify that our call speculation is valid.
+
+        Reviewed by Filip Pizlo.
+
+        Before specialising an intrinsic we need to verify that
+        we our speculation is correct.
+
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::parseBlock):
+
 2011-10-07  Brent Fulgham  <[email protected]>
 
         [WinCairo] Unreviewed build correction for the build bot.

Modified: trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (96977 => 96978)


--- trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2011-10-07 20:24:33 UTC (rev 96977)
+++ trunk/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2011-10-07 20:27:01 UTC (rev 96978)
@@ -1547,7 +1547,7 @@
             
             if (m_graph.isFunctionConstant(m_codeBlock, callTarget))
                 callType = ConstantFunction;
-            else if (m_profiledBlock->getCallLinkInfo(m_currentIndex).isLinked())
+            else if (m_profiledBlock->getCallLinkInfo(m_currentIndex).isLinked() && !m_profiledBlock->likelyToTakeSlowCase(m_currentIndex))
                 callType = LinkedFunction;
             else
                 callType = UnknownFunction;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to