Only read PC marker when we are executing Dart code

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/utils.h"
 
 #include "vm/allocation.h"
 #include "vm/atomic.h"
 #include "vm/code_patcher.h"
 #include "vm/isolate.h"
@@ skipping 1663 matching lines @@
   uword* fp = reinterpret_cast<uword*>(sample->fp());
   uword* sp = reinterpret_cast<uword*>(sample->sp());
 
   // If FP == SP, the pc marker hasn't been pushed.
   if (fp > sp) {
 #if defined(TARGET_OS_WINDOWS)
     // If the fp is at the beginning of a page, it may be unsafe to access
     // the pc marker, because we are reading it from a different thread on
     // Windows. The marker is below fp and the previous page may be a guard
     // page.
+    COMPILE_ASSERT(kPcMarkerSlotFromFp < 0);
     const intptr_t kPageMask = VirtualMemory::PageSize() - 1;
     if ((sample->fp() & kPageMask) == 0) {
       return;
     }
 #endif
     const uword pc_marker = *(fp + kPcMarkerSlotFromFp);
     sample->set_pc_marker(pc_marker);
   }
 }
 
@@ skipping 347 matching lines @@
   ASSERT(counters != NULL);
   counters->Increment(isolate->vm_tag());
 
   // Setup sample.
   Sample* sample = sample_buffer->ReserveSample();
   sample->Init(isolate, OS::GetCurrentTimeMicros(), state.tid);
   sample->set_vm_tag(isolate->vm_tag());
   sample->set_user_tag(isolate->user_tag());
   sample->set_sp(state.sp);
   sample->set_fp(state.fp);
-#if !(defined(TARGET_OS_WINDOWS) && defined(TARGET_ARCH_X64))
-  // It is never safe to read other thread's stack unless on Win64
-  // other thread is inside Dart code.
-  SetPCMarkerIfSafe(sample);
-#endif
-
+  if (isolate->vm_tag() == VMTag::kDartTagId) {
+    // We should only read the PC marker when executing Dart code.
+    SetPCMarkerIfSafe(sample);
+  }
   // Walk the call stack.
   if (FLAG_profile_vm) {
     // Always walk the native stack collecting both native and Dart frames.
     ProfilerNativeStackWalker stackWalker(sample,
                                           stack_lower,
                                           stack_upper,
                                           state.pc,
                                           state.fp,
                                           state.sp);
     stackWalker.walk();
@@ skipping 25 matching lines @@
                                             stack_upper,
                                             state.pc,
                                             state.fp,
                                             state.sp);
       stackWalker.walk();
     }
   }
 }
 
 }  // namespace dart