--- old/src/cpu/x86/vm/frame_x86.cpp	2016-08-01 19:12:48.832441723 -0400
+++ new/src/cpu/x86/vm/frame_x86.cpp	2016-08-01 19:12:48.462837670 -0400
@@ -111,14 +111,7 @@
 
       if (!fp_safe) return false;
 
-      // Validate the JavaCallWrapper an entry frame must have
-
-      address jcw = (address)entry_frame_call_wrapper();
-
-      bool jcw_safe = (jcw < thread->stack_base()) && ( jcw > fp);
-
-      return jcw_safe;
-
+      return entry_frame_is_safe(thread);
     }
 
     intptr_t* sender_sp = NULL;
@@ -209,15 +202,8 @@
       }
 
       // construct the potential sender
-
       frame sender(sender_sp, sender_unextended_sp, saved_fp, sender_pc);
-
-      // Validate the JavaCallWrapper an entry frame must have
-      address jcw = (address)sender.entry_frame_call_wrapper();
-
-      bool jcw_safe = (jcw < thread->stack_base()) && ( jcw > (address)sender.fp());
-
-      return jcw_safe;
+      return sender.entry_frame_is_safe(thread);
     }
 
     CompiledMethod* nm = sender_blob->as_compiled_method_or_null();