Revision: 12658 Author: [email protected] Date: Thu Oct 4 03:02:47 2012 Log: Merged r11840 into 3.11 branch.
MIPS: Fix packed-element.js test on ARM with no snap [email protected] Review URL: https://codereview.chromium.org/11036031 http://code.google.com/p/v8/source/detail?r=12658 Modified: /branches/3.11/src/mips/macro-assembler-mips.cc /branches/3.11/src/version.cc ======================================= --- /branches/3.11/src/mips/macro-assembler-mips.cc Wed Jun 13 04:51:58 2012 +++ /branches/3.11/src/mips/macro-assembler-mips.cc Thu Oct 4 03:02:47 2012 @@ -4459,7 +4459,8 @@ 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 + ======================================= --- /branches/3.11/src/version.cc Fri Sep 21 01:29:01 2012 +++ /branches/3.11/src/version.cc Thu Oct 4 03:02:47 2012 @@ -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
