# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1395362203 25200
# Node ID d3225562f0d88d30b77059c08ad6c45c1db77770
# Parent  0f73f8b75b81a5f94e59f0d0cfa9fae82225154e
guard implicit exception deopt

diff -r 0f73f8b75b81 -r d3225562f0d8 src/share/vm/runtime/sharedRuntime.cpp
--- a/src/share/vm/runtime/sharedRuntime.cpp	Thu Mar 20 16:56:21 2014 -0700
+++ b/src/share/vm/runtime/sharedRuntime.cpp	Thu Mar 20 17:36:43 2014 -0700
@@ -886,7 +886,10 @@
           _implicit_null_throws++;
 #endif
 #ifdef GRAAL
-          if (nm->is_compiled_by_graal()) {
+          if (nm->is_compiled_by_graal() && nm->pc_desc_at(pc) != NULL) {
+            // If there's no PcDesc then we'll die way down inside of
+            // deopt instead of just getting normal error reporting,
+            // so only go there if it will succeed.
             target_pc = deoptimize_for_implicit_exception(thread, pc, nm, Deoptimization::Reason_null_check);
           } else {
 #endif