Title: [197650] trunk/Source/_javascript_Core
Revision
197650
Author
fpi...@apple.com
Date
2016-03-06 18:22:08 -0800 (Sun, 06 Mar 2016)

Log Message

Unreviewed, fix build. This was a messed up merge.

* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileInstanceOf):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (197649 => 197650)


--- trunk/Source/_javascript_Core/ChangeLog	2016-03-07 02:07:28 UTC (rev 197649)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-03-07 02:22:08 UTC (rev 197650)
@@ -1,5 +1,12 @@
 2016-03-06  Filip Pizlo  <fpi...@apple.com>
 
+        Unreviewed, fix build. This was a messed up merge.
+
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compileInstanceOf):
+
+2016-03-06  Filip Pizlo  <fpi...@apple.com>
+
         DFG should know how to speculate StringOrOther
         https://bugs.webkit.org/show_bug.cgi?id=155094
 

Modified: trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp (197649 => 197650)


--- trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2016-03-07 02:07:28 UTC (rev 197649)
+++ trunk/Source/_javascript_Core/ftl/FTLLowerDFGToB3.cpp	2016-03-07 02:22:08 UTC (rev 197650)
@@ -5947,8 +5947,8 @@
         LBasicBlock loop = m_out.newBlock();
         LBasicBlock notYetInstance = m_out.newBlock();
         LBasicBlock continuation = m_out.newBlock();
-        LBasicBlock loadPrototypeDirect = FTL_NEW_BLOCK(m_out, ("Instanceof defaultPrototypeFunction"));
-        LBasicBlock defaultHasInstanceSlow = FTL_NEW_BLOCK(m_out, ("Instanceof defaultPrototypeFunction"));
+        LBasicBlock loadPrototypeDirect = m_out.newBlock();
+        LBasicBlock defaultHasInstanceSlow = m_out.newBlock();
         
         LValue condition;
         if (m_node->child1().useKind() == UntypedUse)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to