[webkit-changes] [161449] branches/jsCStack/Source/JavaScriptCore

[fpizlo]

Title: [161449] branches/jsCStack/Source/_javascript_Core

Revision

161449

Author

fpi...@apple.com

Date

2014-01-07 12:59:43 -0800 (Tue, 07 Jan 2014)

Log Message

Merge trunk r161438.

Modified Paths

branches/jsCStack/Source/_javascript_Core/ChangeLog
branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp

Diff

Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (161448 => 161449)

--- branches/jsCStack/Source/_javascript_Core/ChangeLog	2014-01-07 20:52:56 UTC (rev 161448)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog	2014-01-07 20:59:43 UTC (rev 161449)
@@ -1,5 +1,9 @@
 2014-01-07  Filip Pizlo  <fpi...@apple.com>
 
+        Merge trunk r161438.
+
+2014-01-07  Filip Pizlo  <fpi...@apple.com>
+
         FTL OSR entry should only check input variable types after it has set up OSR exit availability of those OSR entry values
         https://bugs.webkit.org/show_bug.cgi?id=126587
 

Modified: branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp (161448 => 161449)

--- branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2014-01-07 20:52:56 UTC (rev 161448)
+++ branches/jsCStack/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp	2014-01-07 20:59:43 UTC (rev 161449)
@@ -2947,7 +2947,7 @@
             GPRReg resultGPR = result.gpr();
             m_jit.move(op1GPR, resultGPR);
             m_jit.neg64(resultGPR);
-            if (!shouldCheckNegativeZero(node->arithMode())) {
+            if (shouldCheckNegativeZero(node->arithMode())) {
                 speculationCheck(
                     NegativeZero, JSValueRegs(), 0,
                     m_jit.branchTest64(MacroAssembler::Zero, resultGPR));
@@ -2964,7 +2964,7 @@
         speculationCheck(
             Int52Overflow, JSValueRegs(), 0,
             m_jit.branchNeg64(MacroAssembler::Overflow, resultGPR));
-        if (!shouldCheckNegativeZero(node->arithMode())) {
+        if (shouldCheckNegativeZero(node->arithMode())) {
             speculationCheck(
                 NegativeZero, JSValueRegs(), 0,
                 m_jit.branchTest64(MacroAssembler::Zero, resultGPR));

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes