Revision: 13519
Author: [email protected]
Date: Fri Jan 25 07:08:12 2013
Log: Merged r13420 into 3.11 branch.
MIPS: Fix if condition in DoTransitionElementsKind.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/11953106
http://code.google.com/p/v8/source/detail?r=13519
Modified:
/branches/3.11/src/mips/lithium-codegen-mips.cc
/branches/3.11/src/version.cc
=======================================
--- /branches/3.11/src/mips/lithium-codegen-mips.cc Wed Jun 20 12:36:29 2012
+++ /branches/3.11/src/mips/lithium-codegen-mips.cc Fri Jan 25 07:08:12 2013
@@ -3755,7 +3755,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.11/src/version.cc Thu Oct 4 03:02:47 2012
+++ /branches/3.11/src/version.cc Fri Jan 25 07:08:12 2013
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 11
#define BUILD_NUMBER 10
-#define PATCH_LEVEL 25
+#define PATCH_LEVEL 26
// 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
