Changeset 103142 in webkit for trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

Timestamp:

Dec 16, 2011, 8:50:01 PM (13 years ago)

Author:

[email protected]

Message:

Roll out r103139 because it breaks the build.

File:

• trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (modified) (8 diffs)

trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp

@@ -1554 +1554 @@
         speculationCheck(BadType, JSValueSource::unboxedCell(base), baseIndex, m_jit.branchPtr(MacroAssembler::NotEqual, MacroAssembler::Address(base, JSCell::classInfoOffset()), MacroAssembler::TrustedImmPtr(&JSByteArray::s_info)));
     GPRTemporary value;
+    GPRReg valueGPR;
 
     if (at(valueIndex).isConstant()) {
@@ -1572 +1573 @@
         m_jit.move(Imm32((int)d), scratchReg);
         value.adopt(scratch);
+        valueGPR = scratchReg;
     } else if (!at(valueIndex).shouldNotSpeculateInteger()) {
         SpeculateIntegerOperand valueOp(this, valueIndex);
@@ -1586 +1588 @@
         inBounds.link(&m_jit);
         value.adopt(scratch);
+        valueGPR = scratchReg;
     } else {
         SpeculateDoubleOperand valueOp(this, valueIndex);
@@ -1594 +1597 @@
         compileClampDoubleToByte(m_jit, gpr, fpr, floatScratch.fpr());
         value.adopt(result);
+        valueGPR = gpr;
     }
     ASSERT_UNUSED(valueGPR, valueGPR != property);
@@ -1707 +1711 @@
         speculationCheck(BadType, JSValueSource::unboxedCell(base), baseIndex, m_jit.branchPtr(MacroAssembler::NotEqual, MacroAssembler::Address(base, JSCell::classInfoOffset()), MacroAssembler::TrustedImmPtr(descriptor.m_classInfo)));
     GPRTemporary value;
+    GPRReg valueGPR;
     
     if (at(valueIndex).isConstant()) {
@@ -1720 +1725 @@
         m_jit.move(Imm32((int)d), scratchReg);
         value.adopt(scratch);
+        valueGPR = scratchReg;
     } else if (!at(valueIndex).shouldNotSpeculateInteger()) {
         SpeculateIntegerOperand valueOp(this, valueIndex);
@@ -1726 +1732 @@
         m_jit.move(valueOp.gpr(), scratchReg);
         value.adopt(scratch);
+        valueGPR = scratchReg;
     } else {
         SpeculateDoubleOperand valueOp(this, valueIndex);
@@ -1742 +1749 @@
         fixed.link(&m_jit);
         value.adopt(result);
+        valueGPR = gpr;
     }
     ASSERT_UNUSED(valueGPR, valueGPR != property);