A64: Synchronize with r16679.

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 2147 matching lines @@
   // when the C++ code returns to the stub because LR holds the return address
   // in AAPCS64. If the stub is moved (perhaps during a GC), we could end up
   // returning to dead code.
   // TODO(jbramley): Whilst this is the only analysis that makes sense, I can't
   // find any comment to confirm this, and I don't hit any crashes whatever
   // this function returns. The anaylsis should be properly confirmed.
   return true;
 }
 
 
-bool CEntryStub::IsPregenerated() {
+bool CEntryStub::IsPregenerated(Isolate* isolate) {
+  USE(isolate);
   return result_size_ == 1;
 }
 
 
 void CEntryStub::GenerateAheadOfTime(Isolate* isolate) {
   CEntryStub stub(1, kDontSaveFPRegs);
   stub.GetCode(isolate)->set_is_pregenerated(true);
   CEntryStub stub_fp(1, kSaveFPRegs);
   stub_fp.GetCode(isolate)->set_is_pregenerated(true);
 }
@@ skipping 3808 matching lines @@
   }
 }
 
 
 bool CodeStub::CanUseFPRegisters() {
   // FP registers always available on A64.
   return true;
 }
 
 
-bool RecordWriteStub::IsPregenerated() {
+bool RecordWriteStub::IsPregenerated(Isolate* isolate) {
+  USE(isolate);
   // If the stub exists in the kAheadOfTime list, it is pregenerated.
   for (const int* entry = kAheadOfTime; *entry != 0; entry++) {
     if (*entry == MinorKeyFor(object_, value_, address_,
                               remembered_set_action_, save_fp_regs_mode_)) {
       return true;
     }
   }
   return false;
 }
 
@@ skipping 292 matching lines @@
   uintptr_t entry_hook =
       reinterpret_cast<uintptr_t>(masm->isolate()->function_entry_hook());
   __ Mov(x10, entry_hook);
 #else
   // Under the simulator we need to indirect the entry hook through a trampoline
   // function at a known address.
   ApiFunction dispatcher(FUNCTION_ADDR(EntryHookTrampoline));
   __ Mov(x10, Operand(ExternalReference(&dispatcher,
                                         ExternalReference::BUILTIN_CALL,
                                         masm->isolate())));
+  // It additionally takes an isolate as a third parameter
+  __ Mov(x2, Operand(ExternalReference::isolate_address(masm->isolate())));
 #endif
 
   // The caller's return address is above the saved temporaries.
   // Grab its location for the second argument to the hook.
   __ Add(x1, __ StackPointer(), kNumSavedRegs * kPointerSize);
 
   {
     // Create a dummy frame, as CallCFunction requires this.
     FrameScope frame(masm, StackFrame::MANUAL);
     __ CallCFunction(x10, 2, 0);
@@ skipping 584 matching lines @@
   __ Bind(&fast_elements_case);
   GenerateCase(masm, FAST_ELEMENTS);
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64