--- old/src/cpu/aarch64/vm/frame_aarch64.cpp	2016-08-01 19:12:29.355753955 -0400
+++ new/src/cpu/aarch64/vm/frame_aarch64.cpp	2016-08-01 19:12:28.936708220 -0400
@@ -112,15 +112,8 @@
       // an entry frame must have a valid fp.
 
       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;
@@ -210,15 +203,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.is_entry_frame_safe(thread);
     }
 
     CompiledMethod* nm = sender_blob->as_compiled_method_or_null();
--- old/src/cpu/sparc/vm/frame_sparc.cpp	2016-08-01 19:12:39.513027240 -0400
+++ new/src/cpu/sparc/vm/frame_sparc.cpp	2016-08-01 19:12:39.143673123 -0400
@@ -229,15 +229,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* younger_sp = sp();
@@ -290,14 +282,8 @@
       return false;
     }
 
-    if( sender.is_entry_frame()) {
-      // Validate the JavaCallWrapper an entry frame must have
-
-      address jcw = (address)sender.entry_frame_call_wrapper();
-
-      bool jcw_safe = (jcw <= thread->stack_base()) && ( jcw > sender_fp);
-
-      return jcw_safe;
+    if (sender.is_entry_frame()) {
+      return sender.entry_frame_is_safe(thread);
     }
 
     // If the frame size is 0 something (or less) is bad because every nmethod has a non-zero frame size
--- 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();
--- old/src/share/vm/runtime/frame.cpp	2016-08-01 19:12:59.030341315 -0400
+++ new/src/share/vm/runtime/frame.cpp	2016-08-01 19:12:58.656178956 -0400
@@ -225,6 +225,19 @@
   return NULL;
 }
 
+bool frame::entry_frame_is_safe(JavaThread* thread) const {
+  // Validate the JavaCallWrapper an entry frame must have
+  address jcw = (address)entry_frame_call_wrapper();
+  bool jcw_safe = (jcw <= thread->stack_base()) && (jcw > (address)fp());
+  if (!jcw_safe) {
+    return false;
+  }
+
+  // Validate sp saved in the java frame anchor
+  JavaFrameAnchor* jfa = entry_frame_call_wrapper()->anchor();
+  return (jfa->last_Java_sp() > sp());
+}
+
 bool frame::should_be_deoptimized() const {
   if (_deopt_state == is_deoptimized ||
       !is_compiled_frame() ) return false;
--- old/src/share/vm/runtime/frame.hpp	2016-08-01 19:13:07.864172355 -0400
+++ new/src/share/vm/runtime/frame.hpp	2016-08-01 19:13:07.591590501 -0400
@@ -166,6 +166,8 @@
   frame sender_for_interpreter_frame(RegisterMap* map) const;
   frame sender_for_native_frame(RegisterMap* map) const;
 
+  bool entry_frame_is_safe(JavaThread* thread) const;
+
   // All frames:
 
   // A low-level interface for vframes: