A64: Synchronize with r19001.

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 1305 matching lines @@
 
 
 static int AddressOffset(ExternalReference ref0, ExternalReference ref1) {
   return ref0.address() - ref1.address();
 }
 
 
 void MacroAssembler::CallApiFunctionAndReturn(
     Register function_address,
     ExternalReference thunk_ref,
-    Register thunk_last_arg,
     int stack_space,
     int spill_offset,
     MemOperand return_value_operand,
     MemOperand* context_restore_operand) {
   ASM_LOCATION("CallApiFunctionAndReturn");
   ExternalReference next_address =
       ExternalReference::handle_scope_next_address(isolate());
   const int kNextOffset = 0;
   const int kLimitOffset = AddressOffset(
       ExternalReference::handle_scope_limit_address(isolate()),
       next_address);
   const int kLevelOffset = AddressOffset(
       ExternalReference::handle_scope_level_address(isolate()),
       next_address);
 
-  ASSERT(function_address.Is(x3));
-  ASSERT(!AreAliased(function_address, thunk_last_arg, x1, x2));
+  ASSERT(!AreAliased(function_address, x1, x2));
   // TODO(all): Why do we care about aliasing x2? (This function uses x1 as a
   // scratch regiser.)
 
-  // TODO(all): Why isn't thunk_last_arg used?
-  USE(thunk_last_arg);
-
   Label profiler_disabled;
   Label end_profiler_check;
   bool* is_profiling_flag = isolate()->cpu_profiler()->is_profiling_address();
   STATIC_ASSERT(sizeof(*is_profiling_flag) == 1);
   Mov(x10, reinterpret_cast<uintptr_t>(is_profiling_flag));
   Ldrb(w10, MemOperand(x10));
   Cbz(w10, &profiler_disabled);
 
   // Additional parameter is the address of the actual callback.
   Mov(function_address, Operand(thunk_ref));
-  // TODO(jbramley): Remove this once the no-op move at profiler_disabled is
-  // investigated.
-  B(&end_profiler_check);
-
-  Bind(&profiler_disabled);
-  // TODO(jbramley): ARM does a no-op move here. Why?
-  Bind(&end_profiler_check);
+  if (!function_address.Is(x3)) {
+    B(&end_profiler_check);
+    Bind(&profiler_disabled);
+    Mov(x3, function_address);
+    Bind(&end_profiler_check);
+  } else {
+    Bind(&profiler_disabled);
+    Bind(&end_profiler_check);
+  }
 
   // Save the callee-save registers we are going to use.
   // TODO(all): Is this necessary? ARM doesn't do it.
   STATIC_ASSERT(kCallApiFunctionSpillSpace == 4);
   Poke(x19, (spill_offset + 0) * kXRegSizeInBytes);
   Poke(x20, (spill_offset + 1) * kXRegSizeInBytes);
   Poke(x21, (spill_offset + 2) * kXRegSizeInBytes);
   Poke(x22, (spill_offset + 3) * kXRegSizeInBytes);
 
   // Allocate HandleScope in callee-save registers.
@@ skipping 3428 matching lines @@
   }
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64