src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -68,17 +68,15 @@
   if (addr.pc() == NULL) {
     assert(false, "NULL pc from signal handler!");
     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
 
   // If sp and fp are nonsense just leave them out
 
   if (!jt->on_local_stack((address)ret_sp)) {
     ret_sp = NULL;