Reviewers: Mads Ager,
Description:
Merge revision 6714 to the 3.0 branch.
This fixes a bug in the register requirements for Function.prototype.apply.
Please review this at http://codereview.chromium.org/6482021/
SVN Base: https://v8.googlecode.com/svn/branches/3.0/build/ia32
Affected files:
M src/arm/lithium-arm.cc
M src/ia32/lithium-ia32.cc
M src/version.cc
Index: src/arm/lithium-arm.cc
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc
index
b7c1b78d1ba2075ec31e017c97f2268d2653dcb1..961099bf5bb243ac61be7013e6d89e37593596ba
100644
--- a/src/arm/lithium-arm.cc
+++ b/src/arm/lithium-arm.cc
@@ -1088,8 +1088,8 @@ LInstruction* LChunkBuilder::DoInstanceOfKnownGlobal(
LInstruction* LChunkBuilder::DoApplyArguments(HApplyArguments* instr) {
LOperand* function = UseFixed(instr->function(), r1);
LOperand* receiver = UseFixed(instr->receiver(), r0);
- LOperand* length = UseRegisterAtStart(instr->length());
- LOperand* elements = UseRegisterAtStart(instr->elements());
+ LOperand* length = UseFixed(instr->length(), r2);
+ LOperand* elements = UseFixed(instr->elements(), r3);
LApplyArguments* result = new LApplyArguments(function,
receiver,
length,
Index: src/ia32/lithium-ia32.cc
diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
index
c5206d49664b044522879e60ffa7d65d73f1b4e9..dfcc7c5c14d88ce887838be5cfec25f0c748c89d
100644
--- a/src/ia32/lithium-ia32.cc
+++ b/src/ia32/lithium-ia32.cc
@@ -1123,9 +1123,9 @@ LInstruction* LChunkBuilder::DoInstanceOfKnownGlobal(
LInstruction* LChunkBuilder::DoApplyArguments(HApplyArguments* instr) {
LOperand* function = UseFixed(instr->function(), edi);
LOperand* receiver = UseFixed(instr->receiver(), eax);
- LOperand* length = UseRegisterAtStart(instr->length());
- LOperand* elements = UseRegisterAtStart(instr->elements());
- LOperand* temp = FixedTemp(ebx);
+ LOperand* length = UseFixed(instr->length(), ebx);
+ LOperand* elements = UseFixed(instr->elements(), ecx);
+ LOperand* temp = FixedTemp(edx);
LApplyArguments* result = new LApplyArguments(function,
receiver,
length,
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
515c27085c235d316099be53f0986101ad74c7a0..d556c6498a9ea9b2bcbd2f6f23bc263c8cd360d8
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 0
#define BUILD_NUMBER 12
-#define PATCH_LEVEL 14
+#define PATCH_LEVEL 15
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
