--- old/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp	2017-06-29 15:57:08.091296154 -0700
+++ new/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp	2017-06-29 15:57:07.931290003 -0700
@@ -73,13 +73,11 @@
       return false;
     }
 
-#if INCLUDE_CDS
-    if (UseSharedSpaces && MetaspaceShared::is_in_shared_region(addr.pc(), MetaspaceShared::md)) {
+    if (MetaspaceShared::is_in_trampoline_frame(addr.pc())) {
       // In the middle of a trampoline call. Bail out for safety.
       // This happens rarely so shouldn't affect profiling.
       return false;
     }
-#endif
 
     frame ret_frame(ret_sp, ret_fp, addr.pc());
     if (!ret_frame.safe_for_sender(jt)) {