Attempt to fix win64 test failures.

runtime/vm/profiler.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 "platform/address_sanitizer.h"
 #include "platform/memory_sanitizer.h"
 #include "platform/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
@@ skipping 913 matching lines @@
   return reinterpret_cast<uintptr_t>(_ReturnAddress());
 }
 #else
 static uintptr_t __attribute__((noinline)) GetProgramCounter() {
   return reinterpret_cast<uintptr_t>(
       __builtin_extract_return_addr(__builtin_return_address(0)));
 }
 #endif
 
 
+#if defined(TARGET_OS_WINDOWS)
+static uintptr_t GetFramePointer() {
+#if defined(HOST_ARCH_IA32)
+  uintptr_t fp = 0;
+  COPY_FP_REGISTER(fp);
+  return fp;
+#else
+  // We don't have the asm equivalent to get at the frame pointer on
+  // windows x64, return the stack pointer instead.
+  return Thread::GetCurrentStackPointer();
+#endif  // defined(HOST_ARCH_IA32).
+}
+#else
+static uintptr_t GetFramePointer() {
+  uintptr_t fp = 0;
+  COPY_FP_REGISTER(fp);
+  return fp;
+}
+#endif  // defined(TARGET_OS_WINDOWS).
+
+
 void Profiler::DumpStackTrace() {
   // Allow only one stack trace to prevent recursively printing stack traces if
   // we hit an assert while printing the stack.
   static uintptr_t started_dump = 0;
   if (AtomicOperations::FetchAndIncrement(&started_dump) != 0) {
     OS::PrintErr("Aborting re-entrant request for stack trace.\n");
     return;
   }
 
   Thread* thread = Thread::Current();
   if (thread == NULL) {
     return;
   }
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   Isolate* isolate = thread->isolate();
   if (!CheckIsolate(isolate)) {
     return;
   }
 
   OS::PrintErr("Dumping native stack trace for thread %" Px "\n",
                OSThread::ThreadIdToIntPtr(os_thread->trace_id()));
 
   uintptr_t sp = Thread::GetCurrentStackPointer();
-  uintptr_t fp = 0;
+  uintptr_t fp = GetFramePointer();
   uintptr_t pc = GetProgramCounter();
-
-  COPY_FP_REGISTER(fp);
-
   uword stack_lower = 0;
   uword stack_upper = 0;
 
   if (!InitialRegisterCheck(pc, fp, sp)) {
     OS::PrintErr("Stack dump aborted because InitialRegisterCheck.\n");
     return;
   }
 
   if (!GetAndValidateIsolateStackBounds(thread, fp, sp, &stack_lower,
                                         &stack_upper)) {
@@ skipping 20 matching lines @@
 
   const bool exited_dart_code = thread->HasExitedDartCode();
 
   SampleBuffer* sample_buffer = Profiler::sample_buffer();
   if (sample_buffer == NULL) {
     // Profiler not initialized.
     return;
   }
 
   uintptr_t sp = Thread::GetCurrentStackPointer();
-  uintptr_t fp = 0;
+  uintptr_t fp = GetFramePointer();
   uintptr_t pc = GetProgramCounter();
-
-  COPY_FP_REGISTER(fp);
-
   uword stack_lower = 0;
   uword stack_upper = 0;
 
   if (!InitialRegisterCheck(pc, fp, sp)) {
     return;
   }
 
   if (!GetAndValidateIsolateStackBounds(thread, fp, sp, &stack_lower,
                                         &stack_upper)) {
     // Could not get stack boundary.
@@ skipping 482 matching lines @@
 
 
 ProcessedSampleBuffer::ProcessedSampleBuffer()
     : code_lookup_table_(new CodeLookupTable(Thread::Current())) {
   ASSERT(code_lookup_table_ != NULL);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart