A64: Synchronize with r18581.

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 3353 matching lines @@
 
 
 void CallFunctionStub::Generate(MacroAssembler* masm) {
   ASM_LOCATION("CallFunctionStub::Generate");
   // x1  function    the function to call
   // x2  cache_cell  cache cell for call target
   Register function = x1;
   Register cache_cell = x2;
   Label slow, non_function;
 
-  // The receiver might implicitly be the global object. This is
-  // indicated by passing the hole as the receiver to the call
-  // function stub.
-  if (ReceiverMightBeImplicit()) {
-    Label call;
-    // Get the receiver from the stack.
-    // jssp[0] - jssp[argc_ - 1] : arguments
-    // jssp[argc_] : receiver
-    // jssp[argc_ + 1] : function
-    __ Peek(x4, argc_ * kXRegSizeInBytes);
-    // Call as function is indicated with the hole.
-    __ JumpIfNotRoot(x4, Heap::kTheHoleValueRootIndex, &call);
-    // Patch the receiver on the stack with the global receiver object.
-    __ Ldr(x10, GlobalObjectMemOperand());
-    __ Ldr(x11, FieldMemOperand(x10, GlobalObject::kGlobalReceiverOffset));
-    __ Poke(x11, argc_ * kXRegSizeInBytes);
-    __ Bind(&call);
-  }
+  // Check that the function is really a JavaScript function.
+  __ JumpIfSmi(function, &non_function);
 
-  // Check that the function is really a JavaScript function.
-  // x1  function  pushed function (to be verified)
-  __ JumpIfSmi(function, &non_function);
-  // Get the map of the function object.
+  // Goto slow case if we do not have a function.
   __ JumpIfNotObjectType(function, x10, x10, JS_FUNCTION_TYPE, &slow);
 
   if (RecordCallTarget()) {
     GenerateRecordCallTarget(masm);
   }
 
   // Fast-case: Invoke the function now.
   // x1  function  pushed function
   ParameterCount actual(argc_);
 
-  if (ReceiverMightBeImplicit()) {
-    Label call_as_function;
-    __ JumpIfRoot(x4, Heap::kTheHoleValueRootIndex, &call_as_function);
-    __ InvokeFunction(function,
-                      actual,
-                      JUMP_FUNCTION,
-                      NullCallWrapper(),
-                      CALL_AS_METHOD);
-    __ Bind(&call_as_function);
-  }
   __ InvokeFunction(function,
                     actual,
                     JUMP_FUNCTION,
                     NullCallWrapper(),
                     CALL_AS_FUNCTION);
 
   // Slow-case: Non-function called.
   __ Bind(&slow);
   if (RecordCallTarget()) {
     // If there is a call target cache, mark it megamorphic in the
@@ skipping 19 matching lines @@
     __ Jump(adaptor, RelocInfo::CODE_TARGET);
   }
 
   // CALL_NON_FUNCTION expects the non-function callee as receiver (instead
   // of the original receiver from the call site).
   __ Bind(&non_function);
   __ Poke(function, argc_ * kXRegSizeInBytes);
   __ Mov(x0, argc_);  // Set up the number of arguments.
   __ Mov(x2, 0);
   __ GetBuiltinEntry(x3, Builtins::CALL_NON_FUNCTION);
-  __ SetCallKind(x5, CALL_AS_METHOD);
+  __ SetCallKind(x5, CALL_AS_FUNCTION);
   __ Jump(masm->isolate()->builtins()->ArgumentsAdaptorTrampoline(),
           RelocInfo::CODE_TARGET);
 }
 
 
 void CallConstructStub::Generate(MacroAssembler* masm) {
   ASM_LOCATION("CallConstructStub::Generate");
   // x0 : number of arguments
   // x1 : the function to call
   // x2 : cache cell for call target
@@ skipping 2139 matching lines @@
   __ Bind(&not_in_dictionary);
   __ Mov(result, 0);
   __ Ret();
 }
 
 
 template<class T>
 static void CreateArrayDispatch(MacroAssembler* masm,
                                 AllocationSiteOverrideMode mode) {
   if (mode == DISABLE_ALLOCATION_SITES) {
-    T stub(GetInitialFastElementsKind(),
-           CONTEXT_CHECK_REQUIRED,
-           mode);
+    T stub(GetInitialFastElementsKind(), mode);
      __ TailCallStub(&stub);
 
   } else if (mode == DONT_OVERRIDE) {
     Register kind = x3;
     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
@@ skipping 42 matching lines @@
   // Look at the last argument.
   // TODO(jbramley): What does a 0 argument represent?
   __ Peek(x10, 0);
   __ Cbz(x10, &normal_sequence);
 
   if (mode == DISABLE_ALLOCATION_SITES) {
     ElementsKind initial = GetInitialFastElementsKind();
     ElementsKind holey_initial = GetHoleyElementsKind(initial);
 
     ArraySingleArgumentConstructorStub stub_holey(holey_initial,
-                                                  CONTEXT_CHECK_REQUIRED,
                                                   DISABLE_ALLOCATION_SITES);
     __ TailCallStub(&stub_holey);
 
     __ Bind(&normal_sequence);
     ArraySingleArgumentConstructorStub stub(initial,
-                                            CONTEXT_CHECK_REQUIRED,
                                             DISABLE_ALLOCATION_SITES);
     __ TailCallStub(&stub);
   } else if (mode == DONT_OVERRIDE) {
     // We are going to create a holey array, but our kind is non-holey.
     // Fix kind and retry (only if we have an allocation site in the cell).
     __ Orr(kind, kind, 1);
 
     __ Ldr(x10, FieldMemOperand(type_info_cell, Cell::kValueOffset));
 
     if (FLAG_debug_code) {
@@ skipping 29 matching lines @@
     // If we reached this point there is a problem.
     __ Abort(kUnexpectedElementsKindInArrayConstructor);
   } else {
     UNREACHABLE();
   }
 }
 
 
 template<class T>
 static void ArrayConstructorStubAheadOfTimeHelper(Isolate* isolate) {
-  ElementsKind initial_kind = GetInitialFastElementsKind();
-  ElementsKind initial_holey_kind = GetHoleyElementsKind(initial_kind);
-
   int to_index = GetSequenceIndexFromFastElementsKind(
       TERMINAL_FAST_ELEMENTS_KIND);
   for (int i = 0; i <= to_index; ++i) {
     ElementsKind kind = GetFastElementsKindFromSequenceIndex(i);
     T stub(kind);
     stub.GetCode(isolate);
-    if ((AllocationSite::GetMode(kind) != DONT_TRACK_ALLOCATION_SITE) ||
-        (!FLAG_track_allocation_sites &&
-         ((kind == initial_kind) || (kind == initial_holey_kind)))) {
-      T stub1(kind, CONTEXT_CHECK_REQUIRED, DISABLE_ALLOCATION_SITES);
+    if (AllocationSite::GetMode(kind) != DONT_TRACK_ALLOCATION_SITE) {
+      T stub1(kind, DISABLE_ALLOCATION_SITES);
       stub1.GetCode(isolate);
     }
   }
 }
 
 
 void ArrayConstructorStubBase::GenerateStubsAheadOfTime(Isolate* isolate) {
   ArrayConstructorStubAheadOfTimeHelper<ArrayNoArgumentConstructorStub>(
       isolate);
   ArrayConstructorStubAheadOfTimeHelper<ArraySingleArgumentConstructorStub>(
@@ skipping 200 matching lines @@
   __ Bind(&fast_elements_case);
   GenerateCase(masm, FAST_ELEMENTS);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64