Reviewers: Michael Starzinger,
Description:
Merged r11840 into 3.11 branch.
MIPS: Fix packed-element.js test on ARM with no snap
[email protected]
Please review this at https://codereview.chromium.org/11036031/
SVN Base: https://v8.googlecode.com/svn/branches/3.11
Affected files:
M src/mips/macro-assembler-mips.cc
M src/version.cc
Index: src/mips/macro-assembler-mips.cc
diff --git a/src/mips/macro-assembler-mips.cc
b/src/mips/macro-assembler-mips.cc
index
51b3a3823f6082cb41c8383dafb60afc73fb80b8..1a6bc216ccc9d72c5e060249a9ec1bd42f8396eb
100644
--- a/src/mips/macro-assembler-mips.cc
+++ b/src/mips/macro-assembler-mips.cc
@@ -4459,7 +4459,8 @@ void
MacroAssembler::LoadTransitionedArrayMapConditional(
Context::SlotOffset(Context::JS_ARRAY_MAPS_INDEX)));
size_t offset = expected_kind * kPointerSize +
FixedArrayBase::kHeaderSize;
- Branch(no_map_match, ne, map_in_out, Operand(scratch));
+ lw(at, FieldMemOperand(scratch, offset));
+ Branch(no_map_match, ne, map_in_out, Operand(at));
// Use the transitioned cached map.
offset = transitioned_kind * kPointerSize +
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
3bb1d0eaff67e70eb8eccea2c264508c4c91ad12..48dd5ef3d948172d4ad26f39dc5d495dc21f6c63
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 11
#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
