Revision: 9641
Author: [email protected]
Date: Mon Oct 17 00:43:40 2011
Log: Fix evaluation order of GT and LTE operators.
According to the ES5 spec all ">" and "<=" expressions should be be
evaluated left-to-right. This obsoletes old hacks for reversing the
order to be ES3 compliant.
[email protected]
BUG=v8:1752
Review URL: http://codereview.chromium.org/8275035
http://code.google.com/p/v8/source/detail?r=9641
Modified:
/branches/bleeding_edge/src/arm/full-codegen-arm.cc
/branches/bleeding_edge/src/arm/ic-arm.cc
/branches/bleeding_edge/src/arm/lithium-arm.cc
/branches/bleeding_edge/src/arm/lithium-codegen-arm.cc
/branches/bleeding_edge/src/ia32/full-codegen-ia32.cc
/branches/bleeding_edge/src/ia32/ic-ia32.cc
/branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc
/branches/bleeding_edge/src/ia32/lithium-ia32.cc
/branches/bleeding_edge/src/x64/full-codegen-x64.cc
/branches/bleeding_edge/src/x64/ic-x64.cc
/branches/bleeding_edge/src/x64/lithium-codegen-x64.cc
/branches/bleeding_edge/src/x64/lithium-x64.cc
/branches/bleeding_edge/test/mjsunit/compiler/compare.js
/branches/bleeding_edge/test/mjsunit/to_number_order.js
/branches/bleeding_edge/test/mozilla/mozilla.status
/branches/bleeding_edge/test/sputnik/sputnik.status
/branches/bleeding_edge/test/test262/test262.status
=======================================
--- /branches/bleeding_edge/src/arm/full-codegen-arm.cc Wed Oct 12 05:23:06
2011
+++ /branches/bleeding_edge/src/arm/full-codegen-arm.cc Mon Oct 17 00:43:40
2011
@@ -4071,33 +4071,25 @@
case Token::EQ_STRICT:
case Token::EQ:
cond = eq;
- __ pop(r1);
break;
case Token::LT:
cond = lt;
- __ pop(r1);
break;
case Token::GT:
- // Reverse left and right sides to obtain ECMA-262 conversion
order.
- cond = lt;
- __ mov(r1, result_register());
- __ pop(r0);
+ cond = gt;
break;
case Token::LTE:
- // Reverse left and right sides to obtain ECMA-262 conversion
order.
- cond = ge;
- __ mov(r1, result_register());
- __ pop(r0);
+ cond = le;
break;
case Token::GTE:
cond = ge;
- __ pop(r1);
break;
case Token::IN:
case Token::INSTANCEOF:
default:
UNREACHABLE();
}
+ __ pop(r1);
bool inline_smi_code = ShouldInlineSmiCase(op);
JumpPatchSite patch_site(masm_);
=======================================
--- /branches/bleeding_edge/src/arm/ic-arm.cc Mon Oct 10 01:31:06 2011
+++ /branches/bleeding_edge/src/arm/ic-arm.cc Mon Oct 17 00:43:40 2011
@@ -1559,11 +1559,9 @@
case Token::LT:
return lt;
case Token::GT:
- // Reverse left and right operands to obtain ECMA-262 conversion
order.
- return lt;
+ return gt;
case Token::LTE:
- // Reverse left and right operands to obtain ECMA-262 conversion
order.
- return ge;
+ return le;
case Token::GTE:
return ge;
default:
=======================================
--- /branches/bleeding_edge/src/arm/lithium-arm.cc Tue Sep 27 06:03:19 2011
+++ /branches/bleeding_edge/src/arm/lithium-arm.cc Mon Oct 17 00:43:40 2011
@@ -1404,12 +1404,10 @@
LInstruction* LChunkBuilder::DoCompareGeneric(HCompareGeneric* instr) {
- Token::Value op = instr->token();
ASSERT(instr->left()->representation().IsTagged());
ASSERT(instr->right()->representation().IsTagged());
- bool reversed = (op == Token::GT || op == Token::LTE);
- LOperand* left = UseFixed(instr->left(), reversed ? r0 : r1);
- LOperand* right = UseFixed(instr->right(), reversed ? r1 : r0);
+ LOperand* left = UseFixed(instr->left(), r1);
+ LOperand* right = UseFixed(instr->right(), r0);
LCmpT* result = new LCmpT(left, right);
return MarkAsCall(DefineFixed(result, r0), instr);
}
=======================================
--- /branches/bleeding_edge/src/arm/lithium-codegen-arm.cc Fri Oct 14
00:45:18 2011
+++ /branches/bleeding_edge/src/arm/lithium-codegen-arm.cc Mon Oct 17
00:43:40 2011
@@ -2176,9 +2176,6 @@
__ cmp(r0, Operand(0)); // This instruction also signals no smi code
inlined.
Condition condition = ComputeCompareCondition(op);
- if (op == Token::GT || op == Token::LTE) {
- condition = ReverseCondition(condition);
- }
__ LoadRoot(ToRegister(instr->result()),
Heap::kTrueValueRootIndex,
condition);
=======================================
--- /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Fri Oct 14
05:26:29 2011
+++ /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Mon Oct 17
00:43:40 2011
@@ -4147,33 +4147,25 @@
case Token::EQ_STRICT:
case Token::EQ:
cc = equal;
- __ pop(edx);
break;
case Token::LT:
cc = less;
- __ pop(edx);
break;
case Token::GT:
- // Reverse left and right sizes to obtain ECMA-262 conversion
order.
- cc = less;
- __ mov(edx, result_register());
- __ pop(eax);
+ cc = greater;
break;
case Token::LTE:
- // Reverse left and right sizes to obtain ECMA-262 conversion
order.
- cc = greater_equal;
- __ mov(edx, result_register());
- __ pop(eax);
+ cc = less_equal;
break;
case Token::GTE:
cc = greater_equal;
- __ pop(edx);
break;
case Token::IN:
case Token::INSTANCEOF:
default:
UNREACHABLE();
}
+ __ pop(edx);
decrement_stack_height();
bool inline_smi_code = ShouldInlineSmiCase(op);
=======================================
--- /branches/bleeding_edge/src/ia32/ic-ia32.cc Mon Oct 10 01:31:06 2011
+++ /branches/bleeding_edge/src/ia32/ic-ia32.cc Mon Oct 17 00:43:40 2011
@@ -1591,11 +1591,9 @@
case Token::LT:
return less;
case Token::GT:
- // Reverse left and right operands to obtain ECMA-262 conversion
order.
- return less;
+ return greater;
case Token::LTE:
- // Reverse left and right operands to obtain ECMA-262 conversion
order.
- return greater_equal;
+ return less_equal;
case Token::GTE:
return greater_equal;
default:
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc Fri Oct 14
00:45:18 2011
+++ /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc Mon Oct 17
00:43:40 2011
@@ -2029,9 +2029,6 @@
CallCode(ic, RelocInfo::CODE_TARGET, instr);
Condition condition = ComputeCompareCondition(op);
- if (op == Token::GT || op == Token::LTE) {
- condition = ReverseCondition(condition);
- }
Label true_value, done;
__ test(eax, Operand(eax));
__ j(condition, &true_value, Label::kNear);
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-ia32.cc Tue Sep 27 06:03:19
2011
+++ /branches/bleeding_edge/src/ia32/lithium-ia32.cc Mon Oct 17 00:43:40
2011
@@ -1434,13 +1434,11 @@
LInstruction* LChunkBuilder::DoCompareGeneric(HCompareGeneric* instr) {
- Token::Value op = instr->token();
ASSERT(instr->left()->representation().IsTagged());
ASSERT(instr->right()->representation().IsTagged());
- bool reversed = (op == Token::GT || op == Token::LTE);
LOperand* context = UseFixed(instr->context(), esi);
- LOperand* left = UseFixed(instr->left(), reversed ? eax : edx);
- LOperand* right = UseFixed(instr->right(), reversed ? edx : eax);
+ LOperand* left = UseFixed(instr->left(), edx);
+ LOperand* right = UseFixed(instr->right(), eax);
LCmpT* result = new LCmpT(context, left, right);
return MarkAsCall(DefineFixed(result, eax), instr);
}
=======================================
--- /branches/bleeding_edge/src/x64/full-codegen-x64.cc Wed Oct 12 05:23:06
2011
+++ /branches/bleeding_edge/src/x64/full-codegen-x64.cc Mon Oct 17 00:43:40
2011
@@ -3997,33 +3997,25 @@
case Token::EQ_STRICT:
case Token::EQ:
cc = equal;
- __ pop(rdx);
break;
case Token::LT:
cc = less;
- __ pop(rdx);
break;
case Token::GT:
- // Reverse left and right sizes to obtain ECMA-262 conversion
order.
- cc = less;
- __ movq(rdx, result_register());
- __ pop(rax);
+ cc = greater;
break;
case Token::LTE:
- // Reverse left and right sizes to obtain ECMA-262 conversion
order.
- cc = greater_equal;
- __ movq(rdx, result_register());
- __ pop(rax);
+ cc = less_equal;
break;
case Token::GTE:
cc = greater_equal;
- __ pop(rdx);
break;
case Token::IN:
case Token::INSTANCEOF:
default:
UNREACHABLE();
}
+ __ pop(rdx);
bool inline_smi_code = ShouldInlineSmiCase(op);
JumpPatchSite patch_site(masm_);
=======================================
--- /branches/bleeding_edge/src/x64/ic-x64.cc Mon Oct 10 01:31:06 2011
+++ /branches/bleeding_edge/src/x64/ic-x64.cc Mon Oct 17 00:43:40 2011
@@ -1613,11 +1613,9 @@
case Token::LT:
return less;
case Token::GT:
- // Reverse left and right operands to obtain ECMA-262 conversion
order.
- return less;
+ return greater;
case Token::LTE:
- // Reverse left and right operands to obtain ECMA-262 conversion
order.
- return greater_equal;
+ return less_equal;
case Token::GTE:
return greater_equal;
default:
=======================================
--- /branches/bleeding_edge/src/x64/lithium-codegen-x64.cc Fri Oct 14
00:45:18 2011
+++ /branches/bleeding_edge/src/x64/lithium-codegen-x64.cc Mon Oct 17
00:43:40 2011
@@ -1979,9 +1979,6 @@
CallCode(ic, RelocInfo::CODE_TARGET, instr);
Condition condition = TokenToCondition(op, false);
- if (op == Token::GT || op == Token::LTE) {
- condition = ReverseCondition(condition);
- }
Label true_value, done;
__ testq(rax, rax);
__ j(condition, &true_value, Label::kNear);
=======================================
--- /branches/bleeding_edge/src/x64/lithium-x64.cc Tue Sep 27 06:03:19 2011
+++ /branches/bleeding_edge/src/x64/lithium-x64.cc Mon Oct 17 00:43:40 2011
@@ -1396,12 +1396,10 @@
LInstruction* LChunkBuilder::DoCompareGeneric(HCompareGeneric* instr) {
- Token::Value op = instr->token();
ASSERT(instr->left()->representation().IsTagged());
ASSERT(instr->right()->representation().IsTagged());
- bool reversed = (op == Token::GT || op == Token::LTE);
- LOperand* left = UseFixed(instr->left(), reversed ? rax : rdx);
- LOperand* right = UseFixed(instr->right(), reversed ? rdx : rax);
+ LOperand* left = UseFixed(instr->left(), rdx);
+ LOperand* right = UseFixed(instr->right(), rax);
LCmpT* result = new LCmpT(left, right);
return MarkAsCall(DefineFixed(result, rax), instr);
}
=======================================
--- /branches/bleeding_edge/test/mjsunit/compiler/compare.js Fri Mar 18
12:41:05 2011
+++ /branches/bleeding_edge/test/mjsunit/compiler/compare.js Mon Oct 17
00:43:40 2011
@@ -83,9 +83,9 @@
}
TestNonPrimitive("xy", MaxLT);
-TestNonPrimitive("yx", MaxLE);
+TestNonPrimitive("xy", MaxLE);
TestNonPrimitive("xy", MaxGE);
-TestNonPrimitive("yx", MaxGT);
+TestNonPrimitive("xy", MaxGT);
// Test compare in case of aliased registers.
function CmpX(x) { if (x == x) return 42; }
=======================================
--- /branches/bleeding_edge/test/mjsunit/to_number_order.js Tue Dec 7
03:01:02 2010
+++ /branches/bleeding_edge/test/mjsunit/to_number_order.js Mon Oct 17
00:43:40 2011
@@ -161,7 +161,7 @@
x = "";
assertFalse(a > b, "Compare objects a > b");
-assertEquals("fiskhest", x, "Compare objects a > b valueOf order");
+assertEquals("hestfisk", x, "Compare objects a > b valueOf order");
x = "";
assertFalse(a > void(0), "Compare objects a > undefined");
@@ -195,7 +195,7 @@
x = "";
assertFalse(a > b, "Compare objects a > b");
- assertEquals("fiskhest", x, "Compare objects a > b valueOf order");
+ assertEquals("hestfisk", x, "Compare objects a > b valueOf order");
x = "";
assertFalse(a > void(0), "Compare objects a > undefined");
=======================================
--- /branches/bleeding_edge/test/mozilla/mozilla.status Mon Sep 19 11:36:47
2011
+++ /branches/bleeding_edge/test/mozilla/mozilla.status Mon Oct 17 00:43:40
2011
@@ -410,12 +410,6 @@
js1_5/extensions/regress-455413: FAIL_OK
-# The spec specifies reverse evaluation order for < and >=.
-# See section 11.8.2 and 11.8.5.
-# We implement the spec here but the test tests the more straigtforward
order.
-ecma_3/Operators/order-01: FAIL_OK
-
-
# Uses Mozilla-specific QName, XML, XMLList and Iterator.
js1_5/Regress/regress-407323: FAIL_OK
js1_5/Regress/regress-407957: FAIL_OK
=======================================
--- /branches/bleeding_edge/test/sputnik/sputnik.status Wed Oct 5 01:11:53
2011
+++ /branches/bleeding_edge/test/sputnik/sputnik.status Mon Oct 17 00:43:40
2011
@@ -162,6 +162,10 @@
S9.9_A1: FAIL_OK
S9.9_A2: FAIL_OK
+# The expected evaluation order of comparison operations changed.
+S11.8.2_A2.3_T1: FAIL_OK
+S11.8.3_A2.3_T1: FAIL_OK
+
# Calls builtins without an explicit receiver which means that
# undefined is passed to the builtin. The tests expect the global
# object to be passed which was true in ES3 but not in ES5.
=======================================
--- /branches/bleeding_edge/test/test262/test262.status Wed Oct 12 07:47:13
2011
+++ /branches/bleeding_edge/test/test262/test262.status Mon Oct 17 00:43:40
2011
@@ -43,19 +43,6 @@
# V8 Bug: http://code.google.com/p/v8/issues/detail?id=1624
S10.4.2.1_A1: FAIL
-# V8 Bug: http://code.google.com/p/v8/issues/detail?id=1752
-S11.8.2_A2.3_T1: FAIL
-S11.8.3_A2.3_T1: FAIL
-11.8.2-1: FAIL
-11.8.2-2: FAIL
-11.8.2-3: FAIL
-11.8.2-4: FAIL
-11.8.3-1: FAIL
-11.8.3-2: FAIL
-11.8.3-3: FAIL
-11.8.3-4: FAIL
-11.8.3-5: FAIL
-
# V8 Bug.
S13.2.3_A1: FAIL
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
