Fix profiler access to the Dart stack pointer on ARM64.

runtime/vm/signal_handler_android.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
+#include "vm/instructions.h"
 #include "vm/simulator.h"
 #include "vm/signal_handler.h"
 #if defined(TARGET_OS_ANDROID)
 
 namespace dart {
 
 uintptr_t SignalHandler::GetProgramCounter(const mcontext_t& mcontext) {
   uintptr_t pc = 0;
 
 #if defined(HOST_ARCH_IA32)
@@ skipping 42 matching lines @@
 #elif defined(HOST_ARCH_ARM64)
   sp = static_cast<uintptr_t>(mcontext.sp);
 #else
 #error Unsupported architecture.
 #endif  // HOST_ARCH_...
   return sp;
 }
 
 
 uintptr_t SignalHandler::GetDartStackPointer(const mcontext_t& mcontext) {
-  uintptr_t sp = 0;
-
-#if defined(HOST_ARCH_IA32)
-  sp = static_cast<uintptr_t>(mcontext.gregs[REG_ESP]);
-#elif defined(HOST_ARCH_X64)
-  sp = static_cast<uintptr_t>(mcontext.gregs[REG_RSP]);
-#elif defined(HOST_ARCH_ARM)
-  sp = static_cast<uintptr_t>(mcontext.arm_sp);
-#elif defined(HOST_ARCH_ARM64)
-  sp = static_cast<uintptr_t>(mcontext.regs[19]);
+#if defined(TARGET_ARCH_ARM64) && !defined(USING_SIMULATOR)
+  return static_cast<uintptr_t>(mcontext.regs[SPREG]);
 #else
-#error Unsupported architecture.
-#endif  // HOST_ARCH_...
-  return sp;
+  return GetCStackPointer(mcontext);
+#endif
 }
 
 
 uintptr_t SignalHandler::GetLinkRegister(const mcontext_t& mcontext) {
   uintptr_t lr = 0;
 
 #if defined(HOST_ARCH_IA32)
   lr = 0;
 #elif defined(HOST_ARCH_X64)
   lr = 0;
@@ skipping 27 matching lines @@
   act.sa_handler = SIG_IGN;
   sigemptyset(&act.sa_mask);
   int r = sigaction(SIGPROF, &act, NULL);
   ASSERT(r == 0);
 }
 
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)