A64: Synchronize with r18764.

src/a64/macro-assembler-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1001 matching lines @@
   Ldr(map, FieldMemOperand(current_object, HeapObject::kMapOffset));
 
   // For all objects but the receiver, check that the cache is empty.
   EnumLengthUntagged(enum_length, map);
   Cbnz(enum_length, call_runtime);
 
   Bind(&start);
 
   // Check that there are no elements. Register current_object contains the
   // current JS object we've reached through the prototype chain.
+  Label no_elements;
   Ldr(current_object, FieldMemOperand(current_object,
                                       JSObject::kElementsOffset));
   Cmp(current_object, empty_fixed_array_value);
+  B(eq, &no_elements);
+
+  // Second chance, the object may be using the empty slow element dictionary.
+  CompareRoot(current_object, Heap::kEmptySlowElementDictionaryRootIndex);
   B(ne, call_runtime);
 
+  Bind(&no_elements);
   Ldr(current_object, FieldMemOperand(map, Map::kPrototypeOffset));
   Cmp(current_object, null_value);
   B(ne, &next);
 }
 
 
 void MacroAssembler::TestJSArrayForAllocationMemento(Register receiver,
                                                      Register scratch1,
                                                      Register scratch2,
                                                      Label* no_memento_found) {
@@ skipping 2482 matching lines @@
 
 
 // Note: The ARM version of this clobbers elements_reg, but this version does
 // not. Some uses of this in A64 assume that elements_reg will be preserved.
 void MacroAssembler::StoreNumberToDoubleElements(Register value_reg,
                                                  Register key_reg,
                                                  Register elements_reg,
                                                  Register scratch1,
                                                  FPRegister fpscratch1,
                                                  FPRegister fpscratch2,
-                                                 Label* fail) {
+                                                 Label* fail,
+                                                 int elements_offset) {
   ASSERT(!AreAliased(value_reg, key_reg, elements_reg, scratch1));
   Label store_num;
 
   // Speculatively convert the smi to a double - all smis can be exactly
   // represented as a double.
   SmiUntagToDouble(fpscratch1, value_reg, kSpeculativeUntag);
 
   // If value_reg is a smi, we're done.
   JumpIfSmi(value_reg, &store_num);
 
   // Ensure that the object is a heap number.
   CheckMap(value_reg, scratch1, isolate()->factory()->heap_number_map(),
            fail, DONT_DO_SMI_CHECK);
 
   Ldr(fpscratch1, FieldMemOperand(value_reg, HeapNumber::kValueOffset));
   Fmov(fpscratch2, FixedDoubleArray::canonical_not_the_hole_nan_as_double());
 
   // Check for NaN by comparing the number to itself: NaN comparison will
   // report unordered, indicated by the overflow flag being set.
   Fcmp(fpscratch1, fpscratch1);
   Fcsel(fpscratch1, fpscratch2, fpscratch1, vs);
 
   // Store the result.
   Bind(&store_num);
   Add(scratch1, elements_reg,
       Operand::UntagSmiAndScale(key_reg, kDoubleSizeLog2));
-  Str(fpscratch1, FieldMemOperand(scratch1, FixedDoubleArray::kHeaderSize));
+  Str(fpscratch1,
+      FieldMemOperand(scratch1,
+                      FixedDoubleArray::kHeaderSize - elements_offset));
 }
 
 
 bool MacroAssembler::AllowThisStubCall(CodeStub* stub) {
   return has_frame_ || !stub->SometimesSetsUpAFrame();
 }
 
 
 void MacroAssembler::IndexFromHash(Register hash, Register index) {
   // If the hash field contains an array index pick it out. The assert checks
@@ skipping 1218 matching lines @@
   }
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64