Reviewers: Erik Corry,
Description:
Merge r8007 to 2.2 branch
r8007: ARM: Fix wrong value returned from keyed property assignemnt
[email protected]
BUG=1401
TEST=test/mjsunit/regress/regress-1401.js
Please review this at http://codereview.chromium.org/7066008/
SVN Base: http://v8.googlecode.com/svn/branches/2.2/
Affected files:
M src/arm/codegen-arm.cc
M src/version.cc
A + test/mjsunit/regress/regress-1401.js
### BEGIN SVN COPY METADATA
#$ cp branches/3.1/test/mjsunit/regress/regress-1401.js
test/mjsunit/regress/regress-1401.js
### END SVN COPY METADATA
Index: src/arm/codegen-arm.cc
===================================================================
--- src/arm/codegen-arm.cc (revision 8008)
+++ src/arm/codegen-arm.cc (working copy)
@@ -6500,6 +6500,9 @@
ASSERT(we_remembered_the_write_barrier);
+ // Make sure that r0 holds the value which is the result of the
expression.
+ __ Move(r0, value);
+
deferred->BindExit();
} else {
frame()->CallKeyedStoreIC();
Index: src/version.cc
===================================================================
--- src/version.cc (revision 8008)
+++ src/version.cc (working copy)
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 2
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 31
+#define PATCH_LEVEL 32
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
Index: test/mjsunit/regress/regress-1401.js
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
