commit c44da652ce890187ad6e59f62635501f172ed089
author Martin Doerr <mdoerr@openjdk.org> Thu Jul 08 12:41:46 2021 +0000
committer Martin Doerr <mdoerr@openjdk.org> Thu Jul 08 12:41:46 2021 +0000
tree 941754604cc6e59e5cf702b04a675a6b44356a23
parent 2beb7e7a5834c45850e1bde8d98ed0839726db20

8268369: SIGSEGV in PhaseCFG::implicit_null_check due to missing null check

Backport-of: 4ad8b04421f3142c396ade26f36334da7a915b5b

src/hotspot/share/opto/lcm.cpp

diff --git a/src/hotspot/share/opto/lcm.cpp b/src/hotspot/share/opto/lcm.cpp
index 92a04af..53f79cf 100644
--- a/src/hotspot/share/opto/lcm.cpp
+++ b/src/hotspot/share/opto/lcm.cpp
@@ -414,7 +414,7 @@
   // Move the control dependence if it is pinned to not-null block.
   // Don't change it in other cases: NULL or dominating control.
   Node* ctrl = best->in(0);
-  if (get_block_for_node(ctrl) == not_null_block) {
+  if (ctrl != NULL && get_block_for_node(ctrl) == not_null_block) {
     // Set it to control edge of null check.
     best->set_req(0, proj->in(0)->in(0));
   }