Revision: 8449
Author: [email protected]
Date: Tue Jun 28 07:14:55 2011
Log: Merge r8443 from bleeding edge to 3.2 branch.
Fix bug in register assignment of IsObjectAndBranch.
Review URL: http://codereview.chromium.org/7276036
http://code.google.com/p/v8/source/detail?r=8449
Modified:
/branches/3.2/src/arm/lithium-arm.cc
/branches/3.2/src/ia32/lithium-ia32.cc
/branches/3.2/src/version.cc
=======================================
--- /branches/3.2/src/arm/lithium-arm.cc Wed Jun 22 08:46:29 2011
+++ /branches/3.2/src/arm/lithium-arm.cc Tue Jun 28 07:14:55 2011
@@ -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()),
=======================================
--- /branches/3.2/src/ia32/lithium-ia32.cc Wed Jun 22 08:46:29 2011
+++ /branches/3.2/src/ia32/lithium-ia32.cc Tue Jun 28 07:14:55 2011
@@ -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()) {
=======================================
--- /branches/3.2/src/version.cc Tue Jun 28 01:15:40 2011
+++ /branches/3.2/src/version.cc Tue Jun 28 07:14:55 2011
@@ -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
