Synchronize with r15594.

src/a64/code-stubs-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 2879 matching lines @@
     //  -- x2    : name
     //  -- x0    : receiver
     //  -- sp[0] : receiver
     // -----------------------------------
     receiver = x0;
   }
 
   StubCompiler::GenerateLoadFunctionPrototype(masm, receiver, x10, x11, &miss);
 
   __ Bind(&miss);
-  StubCompiler::TailCallBuiltin(masm, StubCompiler::MissBuiltin(kind()));
+  StubCompiler::TailCallBuiltin(masm,
+                                BaseLoadStoreStubCompiler::MissBuiltin(kind()));
 }
 
 
 void StringLengthStub::Generate(MacroAssembler* masm) {
   Label miss;
   Register receiver;
   if (kind() == Code::KEYED_LOAD_IC) {
     // ----------- S t a t e -------------
     //  -- lr    : return address
     //  -- x1    : receiver
@@ skipping 11 matching lines @@
     //  -- x0    : receiver
     //  -- sp[0] : receiver
     // -----------------------------------
     receiver = x0;
   }
 
   StubCompiler::GenerateLoadStringLength(masm, receiver, x10, x11, &miss,
                                          support_wrapper_);
 
   __ Bind(&miss);
-  StubCompiler::TailCallBuiltin(masm, StubCompiler::MissBuiltin(kind()));
+  StubCompiler::TailCallBuiltin(masm,
+                                BaseLoadStoreStubCompiler::MissBuiltin(kind()));
 }
 
 
 void StoreArrayLengthStub::Generate(MacroAssembler* masm) {
   ASM_LOCATION("StoreArrayLengthStub::Generate");
   // This accepts as a receiver anything JSArray::SetElementsLength accepts
   // (currently anything except for external arrays which means anything with
   // elements of FixedArray type).  Value must be a number, but only smis are
   // accepted as the most common case.
   Label miss;
@@ skipping 49 matching lines @@
   __ JumpIfNotSmi(value, &miss);
 
   // Prepare tail call to StoreIC_ArrayLength.
   __ Push(receiver, value);
 
   ExternalReference ref =
       ExternalReference(IC_Utility(IC::kStoreIC_ArrayLength), masm->isolate());
   __ TailCallExternalReference(ref, 2, 1);
 
   __ Bind(&miss);
-  StubCompiler::TailCallBuiltin(masm, StubCompiler::MissBuiltin(kind()));
+  StubCompiler::TailCallBuiltin(masm,
+                                BaseLoadStoreStubCompiler::MissBuiltin(kind()));
 }
 
 
 void InstanceofStub::Generate(MacroAssembler* masm) {
   // Stack on entry:
   // jssp[0]: function.
   // jssp[8]: object.
   //
   // Returns result in x0. Zero indicates instanceof, smi 1 indicates not
   // instanceof.
@@ skipping 3796 matching lines @@
                 &normal_sequence);
 
   __ Ldr(x10, FieldMemOperand(type_info_cell, Cell::kValueOffset));
   __ Ldr(x10, FieldMemOperand(x10, 0));
   __ JumpIfNotRoot(x10, Heap::kAllocationSiteMapRootIndex, &normal_sequence);
 
   // Save the resulting elements kind in type info.
   // TODO(jbramley): Tag and store at the same time.
   __ SmiTag(x10, kind);
   __ Ldr(x11, FieldMemOperand(type_info_cell, Cell::kValueOffset));
-  __ Str(x10, FieldMemOperand(x11, AllocationSite::kPayloadOffset));
+  __ Str(x10, FieldMemOperand(x11, AllocationSite::kTransitionInfoOffset));
 
   __ Bind(&normal_sequence);
   int last_index = GetSequenceIndexFromFastElementsKind(
       TERMINAL_FAST_ELEMENTS_KIND);
   for (int i = 0; i <= last_index; ++i) {
     Label next;
     ElementsKind candidate_kind = GetFastElementsKindFromSequenceIndex(i);
     // TODO(jbramley): Is this the best way to handle this? Can we make the tail
     // calls conditional, rather than hopping over each one?
     __ CompareAndBranch(kind, candidate_kind, ne, &next);
@@ skipping 87 matching lines @@
 
   Register kind = x3;
   Label no_info, switch_ready;
   // Get the elements kind and case on that.
   __ JumpIfRoot(type_info_cell, Heap::kUndefinedValueRootIndex, &no_info);
   __ Ldr(kind, FieldMemOperand(type_info_cell, PropertyCell::kValueOffset));
 
   // The type cell may have undefined in its value.
   __ JumpIfRoot(kind, Heap::kUndefinedValueRootIndex, &no_info);
 
-  // We should have an allocation site object
-  if (FLAG_debug_code) {
-    __ Ldr(x10, FieldMemOperand(kind, AllocationSite::kMapOffset));
-    __ CompareRoot(x10, Heap::kAllocationSiteMapRootIndex);
-    __ Assert(eq, "Expected AllocationSite object.");
-  }
+  // The type cell has either an AllocationSite or a JSFunction.
+  __ Ldr(x10, FieldMemOperand(kind, AllocationSite::kMapOffset));
+  __ JumpIfNotRoot(x10, Heap::kAllocationSiteMapRootIndex, &no_info);
 
-  __ Ldrsw(kind, UntagSmiFieldMemOperand(kind, AllocationSite::kPayloadOffset));
+  __ Ldrsw(kind,
+           UntagSmiFieldMemOperand(kind,
+                                   AllocationSite::kTransitionInfoOffset));
   __ B(&switch_ready);
 
   __ Bind(&no_info);
   __ Mov(kind, GetInitialFastElementsKind());
   __ Bind(&switch_ready);
 
   if (argument_count_ == ANY) {
     Label zero_case, n_case;
     __ Cbz(argc, &zero_case);
     __ Cmp(argc, 1);
@@ skipping 114 matching lines @@
   __ Bind(&fast_elements_case);
   GenerateCase(masm, FAST_ELEMENTS);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64