Changeset 198024 in webkit

Timestamp:

Mar 11, 2016 9:51:00 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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

Broke several ARM tests (Requested by msaboff on #webkit).

Reverted changeset:

"[JSC] Add register reuse for ArithAdd of an Int32 and
constant in DFG"
​https://bugs.webkit.org/show_bug.cgi?id=155164
​http://trac.webkit.org/changeset/197994

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• dfg/DFGOSRExit.h (modified) (3 diffs)
• dfg/DFGOSRExitCompiler32_64.cpp (modified) (1 diff)
• dfg/DFGOSRExitCompiler64.cpp (modified) (1 diff)
• dfg/DFGSpeculativeJIT.cpp (modified) (1 diff)
• tests/stress/arith-add-with-constant-overflow.js (deleted)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-03-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r197994.
+        https://bugs.webkit.org/show_bug.cgi?id=155368
+
+        Broke several ARM tests (Requested by msaboff on #webkit).
+
+        Reverted changeset:
+
+        "[JSC] Add register reuse for ArithAdd of an Int32 and
+        constant in DFG"
+        https://bugs.webkit.org/show_bug.cgi?id=155164
+        http://trac.webkit.org/changeset/197994
+
 2016-03-11  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/dfg/DFGOSRExit.h

@@ -49 +49 @@
 // This enum describes the types of additional recovery that
 // may need be performed should a speculation check fail.
-enum SpeculationRecoveryType : uint8_t {
+enum SpeculationRecoveryType {
     SpeculativeAdd,
-    SpeculativeAddImmediate,
     BooleanSpeculationCheck
 };
@@ -62 +61 @@
 public:
     SpeculationRecovery(SpeculationRecoveryType type, GPRReg dest, GPRReg src)
-        : m_src(src)
+        : m_type(type)
         , m_dest(dest)
-        , m_type(type)
-    {
-    }
-
-    SpeculationRecovery(SpeculationRecoveryType type, GPRReg dest, int32_t immediate)
-        : m_immediate(immediate)
-        , m_dest(dest)
-        , m_type(type)
+        , m_src(src)
     {
     }
@@ -78 +70 @@
     GPRReg dest() { return m_dest; }
     GPRReg src() { return m_src; }
-    int32_t immediate() { return m_immediate; }
 
 private:
-    // different recovery types may required different additional information here.
-    union {
-        GPRReg m_src;
-        int32_t m_immediate;
-    };
-    GPRReg m_dest;
-
     // Indicates the type of additional recovery to be performed.
     SpeculationRecoveryType m_type;
+    // different recovery types may required different additional information here.
+    GPRReg m_dest;
+    GPRReg m_src;
 };
 

trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler32_64.cpp

@@ -56 +56 @@
         case SpeculativeAdd:
             m_jit.sub32(recovery->src(), recovery->dest());
-            break;
-
-        case SpeculativeAddImmediate:
-            m_jit.sub32(AssemblyHelpers::Imm32(recovery->immediate()), recovery->dest());
             break;
             

trunk/Source/JavaScriptCore/dfg/DFGOSRExitCompiler64.cpp

@@ -62 +62 @@
             m_jit.or64(GPRInfo::tagTypeNumberRegister, recovery->dest());
             break;
-
-        case SpeculativeAddImmediate:
-            m_jit.sub32(AssemblyHelpers::Imm32(recovery->immediate()), recovery->dest());
-            m_jit.or64(GPRInfo::tagTypeNumberRegister, recovery->dest());
-            break;
             
         case BooleanSpeculationCheck:

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -3257 +3257 @@
         if (node->child2()->isInt32Constant()) {
             SpeculateInt32Operand op1(this, node->child1());
-            GPRTemporary result(this, Reuse, op1);
-
-            GPRReg gpr1 = op1.gpr();
             int32_t imm2 = node->child2()->asInt32();
-            GPRReg gprResult = result.gpr();
 
             if (!shouldCheckOverflow(node->arithMode())) {
-                m_jit.add32(Imm32(imm2), gpr1, gprResult);
-                int32Result(gprResult, node);
+                GPRTemporary result(this, Reuse, op1);
+                m_jit.add32(Imm32(imm2), op1.gpr(), result.gpr());
+                int32Result(result.gpr(), node);
                 return;
             }
 
-            MacroAssembler::Jump check = m_jit.branchAdd32(MacroAssembler::Overflow, gpr1, Imm32(imm2), gprResult);
-            if (gpr1 == gprResult) {
-                speculationCheck(Overflow, JSValueRegs(), 0, check,
-                    SpeculationRecovery(SpeculativeAddImmediate, gpr1, imm2));
-            } else
-                speculationCheck(Overflow, JSValueRegs(), 0, check);
-
-            int32Result(gprResult, node);
+            GPRTemporary result(this);
+            speculationCheck(Overflow, JSValueRegs(), 0, m_jit.branchAdd32(MacroAssembler::Overflow, op1.gpr(), Imm32(imm2), result.gpr()));
+
+            int32Result(result.gpr(), node);
             return;
         }