A64: Synchronize with r17441.

src/a64/codegen-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 127 matching lines @@
     Label* allocation_memento_found) {
   // ----------- S t a t e -------------
   //  -- x2    : receiver
   //  -- x3    : target map
   // -----------------------------------
   Register receiver = x2;
   Register map = x3;
 
   if (mode == TRACK_ALLOCATION_SITE) {
     ASSERT(allocation_memento_found != NULL);
-    __ TestJSArrayForAllocationMemento(receiver, x10, x11);
-    __ B(eq, allocation_memento_found);
+    __ JumpIfJSArrayHasAllocationMemento(receiver, x10, x11,
+                                         allocation_memento_found);
   }
 
   // Set transitioned map.
   __ Str(map, FieldMemOperand(receiver, HeapObject::kMapOffset));
   __ RecordWriteField(receiver,
                       HeapObject::kMapOffset,
                       map,
                       x10,
                       kLRHasNotBeenSaved,
                       kDontSaveFPRegs,
@@ skipping 11 matching lines @@
   //  -- x1    : key
   //  -- x2    : receiver
   //  -- x3    : target map, scratch for subsequent call
   // -----------------------------------
   Register receiver = x2;
   Register target_map = x3;
 
   Label gc_required, only_change_map;
 
   if (mode == TRACK_ALLOCATION_SITE) {
-    __ TestJSArrayForAllocationMemento(receiver, x10, x11);
-    __ B(eq, fail);
+    __ JumpIfJSArrayHasAllocationMemento(receiver, x10, x11, fail);
   }
 
   // Check for empty arrays, which only require a map transition and no changes
   // to the backing store.
   Register elements = x4;
   __ Ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
   __ JumpIfRoot(elements, Heap::kEmptyFixedArrayRootIndex, &only_change_map);
 
   __ Push(lr);
   Register length = x5;
@@ skipping 84 matching lines @@
   //  -- lr    : return address
   //  -- x3    : target map, scratch for subsequent call
   //  -- x4    : scratch (elements)
   // -----------------------------------
   Register value = x0;
   Register key = x1;
   Register receiver = x2;
   Register target_map = x3;
 
   if (mode == TRACK_ALLOCATION_SITE) {
-    __ TestJSArrayForAllocationMemento(receiver, x10, x11);
-    __ B(eq, fail);
+    __ JumpIfJSArrayHasAllocationMemento(receiver, x10, x11, fail);
   }
 
   // Check for empty arrays, which only require a map transition and no changes
   // to the backing store.
   Label only_change_map;
   Register elements = x4;
   __ Ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
   __ JumpIfRoot(elements, Heap::kEmptyFixedArrayRootIndex, &only_change_map);
 
   __ Push(lr);
@@ skipping 87 matching lines @@
 
 
 bool Code::IsYoungSequence(byte* sequence) {
   return MacroAssembler::IsYoungSequence(sequence);
 }
 
 
 void Code::GetCodeAgeAndParity(byte* sequence, Age* age,
                                MarkingParity* parity) {
   if (IsYoungSequence(sequence)) {
-    *age = kNoAge;
+    *age = kNoAgeCodeAge;
     *parity = NO_MARKING_PARITY;
   } else {
     byte* target = sequence + kCodeAgeStubEntryOffset;
     Code* stub = GetCodeFromTargetAddress(Memory::Address_at(target));
     GetCodeAgeAndParity(stub, age, parity);
   }
 }
 
 
 void Code::PatchPlatformCodeAge(Isolate* isolate,
                                 byte* sequence,
                                 Code::Age age,
                                 MarkingParity parity) {
   PatchingAssembler patcher(sequence, kCodeAgeSequenceSize / kInstructionSize);
-  if (age == kNoAge) {
+  if (age == kNoAgeCodeAge) {
     MacroAssembler::EmitFrameSetupForCodeAgePatching(&patcher);
   } else {
     Code * stub = GetCodeAgeStub(isolate, age, parity);
     MacroAssembler::EmitCodeAgeSequence(&patcher, stub);
   }
 }
 
 
 void StringCharLoadGenerator::Generate(MacroAssembler* masm,
                                        Register string,
@@ skipping 197 matching lines @@
   __ Fmul(result, double_temp3, double_temp1);
 
   __ Bind(&done);
 }
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64