Reviewers: ulan,
Description:
Merged r13420 into 3.14 branch.
MIPS: Fix if condition in DoTransitionElementsKind.
[email protected]
Please review this at https://chromiumcodereview.appspot.com/12038092/
SVN Base: https://v8.googlecode.com/svn/branches/3.14
Affected files:
M src/mips/lithium-codegen-mips.cc
M src/version.cc
Index: src/mips/lithium-codegen-mips.cc
diff --git a/src/mips/lithium-codegen-mips.cc
b/src/mips/lithium-codegen-mips.cc
index
4c2182bdb004ebf57b1ac3fff3f0cdfbdf43b59b..21fd2ce48175bc2023dcb2ac639f29d7fd68a1b7
100644
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -3938,7 +3938,7 @@ void
LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
__ Branch(¬_applicable, ne, scratch, Operand(from_map));
__ li(new_map_reg, Operand(to_map));
- if (IsFastSmiElementsKind(from_kind) &&
IsFastObjectElementsKind(to_kind)) {
+ if (IsSimpleMapChangeTransition(from_kind, to_kind)) {
__ sw(new_map_reg, FieldMemOperand(object_reg,
HeapObject::kMapOffset));
// Write barrier.
__ RecordWriteField(object_reg, HeapObject::kMapOffset, new_map_reg,
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
a391445b465d5dd2a2acd3b8d1ab5d060013a3b6..74c4562311436dda5a7050b7faae04bd497cc61b
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 14
#define BUILD_NUMBER 5
-#define PATCH_LEVEL 5
+#define PATCH_LEVEL 6
// 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
