Revision: 13513
Author: [email protected]
Date: Fri Jan 25 06:56:20 2013
Log: Merged r13420 into 3.14 branch.
MIPS: Fix if condition in DoTransitionElementsKind.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/12038092
http://code.google.com/p/v8/source/detail?r=13513
Modified:
/branches/3.14/src/mips/lithium-codegen-mips.cc
/branches/3.14/src/version.cc
=======================================
--- /branches/3.14/src/mips/lithium-codegen-mips.cc Mon Oct 22 06:09:53 2012
+++ /branches/3.14/src/mips/lithium-codegen-mips.cc Fri Jan 25 06:56:20 2013
@@ -3938,7 +3938,7 @@
__ 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,
=======================================
--- /branches/3.14/src/version.cc Fri Jan 18 06:13:21 2013
+++ /branches/3.14/src/version.cc Fri Jan 25 06:56:20 2013
@@ -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
