[v8-dev] Merged r13420 into 3.11 branch. (issue 11953106)

Fri, 25 Jan 2013 07:07:11 -0800 

Reviewers: ulan,

Description:
Merged r13420 into 3.11 branch.

MIPS: Fix if condition in DoTransitionElementsKind.

[email protected]


Please review this at https://chromiumcodereview.appspot.com/11953106/

SVN Base: https://v8.googlecode.com/svn/branches/3.11

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 68f8a3dd7d1d47a6b17c2eae27c3860d118ce847..849b04fdc2f520079b03c744b360677222e24770 100644 
--- a/src/mips/lithium-codegen-mips.cc
+++ b/src/mips/lithium-codegen-mips.cc
@@ -3755,7 +3755,7 @@ void LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) { 
   __ Branch(&not_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 48dd5ef3d948172d4ad26f39dc5d495dc21f6c63..4cbf30e63c566c058491bcd5636a122e2e6f4671 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       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

Reply via email to