src/share/vm/opto/graphKit.cpp

*** 1210,1219 ****
--- 1210,1220 ----
      } else if (assert_null) {
        uncommon_trap(reason,
                      Deoptimization::Action_make_not_entrant,
                      NULL, "assert_null");
      } else {
+       replace_in_map(value, zerocon(type));
        builtin_throw(reason);
      }
    }
  
    // Must throw exception, fall-thru not possible?
*** 1958,1967 ****
--- 1959,1969 ----
      // recompile; the offending check-cast will be compiled to handle NULLs.
      // If we see more than one offending BCI, then all checkcasts in the
      // method will be compiled to handle NULLs.
      PreserveJVMState pjvms(this);
      set_control(*null_control);
+     replace_in_map(value, null());
      uncommon_trap(Deoptimization::Reason_null_check,
                    Deoptimization::Action_make_not_entrant);
      (*null_control) = top();    // NULL path is dead
    }