--- a/hotspot/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp	Sat Jul 22 15:54:27 2017 -0400
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp	Wed Aug 02 18:06:38 2017 -0700
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -78,13 +78,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, frame::unpatchable, addr.pc());