Reviewers: Toon Verwaest, danno, Paul Lind, kisg,

Message:
Please merge the following CLs first to avoid merge conflicts:

https://chromiumcodereview.appspot.com/11411253/
https://chromiumcodereview.appspot.com/11316235/

Description:
MIPS: Only fill in holes if storing the number to the double array has
succeeded.

Port r13067 (c822cffa)

BUG=
TEST=


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

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

Affected files:
  M src/mips/stub-cache-mips.cc


Index: src/mips/stub-cache-mips.cc
diff --git a/src/mips/stub-cache-mips.cc b/src/mips/stub-cache-mips.cc
index 7aed0810a9b0c01b3df84699e8f2df66e42d2bc7..326cba788bafb454977f841aaaa918778fbc1661 100644
--- a/src/mips/stub-cache-mips.cc
+++ b/src/mips/stub-cache-mips.cc
@@ -4852,14 +4852,6 @@ void KeyedStoreStubCompiler::GenerateStoreFastDoubleElement(
     __ sw(scratch1,
           FieldMemOperand(elements_reg, FixedDoubleArray::kLengthOffset));

-    __ li(scratch1, Operand(kHoleNanLower32));
-    __ li(scratch2, Operand(kHoleNanUpper32));
-    for (int i = 1; i < JSArray::kPreallocatedArrayElements; i++) {
-      int offset = FixedDoubleArray::OffsetOfElementAt(i);
-      __ sw(scratch1, FieldMemOperand(elements_reg, offset));
- __ sw(scratch2, FieldMemOperand(elements_reg, offset + kPointerSize));
-    }
-
     __ mov(scratch1, elements_reg);
     __ StoreNumberToDoubleElements(value_reg,
                                    key_reg,
@@ -4871,6 +4863,14 @@ void KeyedStoreStubCompiler::GenerateStoreFastDoubleElement(
                                    scratch5,
                                    &transition_elements_kind);

+    __ li(scratch1, Operand(kHoleNanLower32));
+    __ li(scratch2, Operand(kHoleNanUpper32));
+    for (int i = 1; i < JSArray::kPreallocatedArrayElements; i++) {
+      int offset = FixedDoubleArray::OffsetOfElementAt(i);
+      __ sw(scratch1, FieldMemOperand(elements_reg, offset));
+ __ sw(scratch2, FieldMemOperand(elements_reg, offset + kPointerSize));
+    }
+
     // Install the new backing store in the JSArray.
     __ sw(elements_reg,
           FieldMemOperand(receiver_reg, JSObject::kElementsOffset));


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to