Reviewers: Mads Ager,
Description:
Merge r8443 from bleeding edge to 3.2 branch.
Fix bug in register assignment of IsObjectAndBranch.
Please review this at http://codereview.chromium.org/7276036/
SVN Base: http://v8.googlecode.com/svn/branches/3.2/
Affected files:
M src/arm/lithium-arm.cc
M src/ia32/lithium-ia32.cc
M src/version.cc
Index: src/arm/lithium-arm.cc
===================================================================
--- src/arm/lithium-arm.cc (revision 8446)
+++ src/arm/lithium-arm.cc (working copy)
@@ -1096,7 +1096,7 @@
ASSERT(compare->value()->representation().IsTagged());
LOperand* temp = TempRegister();
- return new LIsObjectAndBranch(UseRegisterAtStart(compare->value()),
temp);
+ return new LIsObjectAndBranch(UseRegister(compare->value()), temp);
} else if (v->IsCompareJSObjectEq()) {
HCompareJSObjectEq* compare = HCompareJSObjectEq::cast(v);
return new
LCmpJSObjectEqAndBranch(UseRegisterAtStart(compare->left()),
Index: src/ia32/lithium-ia32.cc
===================================================================
--- src/ia32/lithium-ia32.cc (revision 8446)
+++ src/ia32/lithium-ia32.cc (working copy)
@@ -1098,7 +1098,7 @@
LOperand* temp1 = TempRegister();
LOperand* temp2 = TempRegister();
- return new LIsObjectAndBranch(UseRegisterAtStart(compare->value()),
+ return new LIsObjectAndBranch(UseRegister(compare->value()),
temp1,
temp2);
} else if (v->IsCompareJSObjectEq()) {
Index: src/version.cc
===================================================================
--- src/version.cc (revision 8446)
+++ src/version.cc (working copy)
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 2
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 24
+#define PATCH_LEVEL 25
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
