src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp

*** 1371,1380 ****
--- 1371,1384 ----
    // info for exceptions
    CodeEmitInfo* info_for_exception =
        (x->needs_exception_state() ? state_for(x) :
                                      state_for(x, x->state_before(), true /*ignore_xhandler*/));
  
+   if (x->is_never_null()) {
+     __ null_check(obj.result(), new CodeEmitInfo(info_for_exception), /* deoptimize */ false);
+   }
+ 
    CodeStub* stub;
    if (x->is_incompatible_class_change_check()) {
      assert(patching_info == NULL, "can't patch this");
      stub = new SimpleExceptionStub(Runtime1::throw_incompatible_class_change_error_id, LIR_OprFact::illegalOpr, info_for_exception);
    } else if (x->is_invokespecial_receiver_check()) {
*** 1389,1399 ****
      tmp3 = new_register(objectType);
    }
    __ checkcast(reg, obj.result(), x->klass(),
                 new_register(objectType), new_register(objectType), tmp3,
                 x->direct_compare(), info_for_exception, patching_info, stub,
!                x->profiled_method(), x->profiled_bci());
  }
  
  
  void LIRGenerator::do_InstanceOf(InstanceOf* x) {
    LIRItem obj(x->obj(), this);
--- 1393,1403 ----
      tmp3 = new_register(objectType);
    }
    __ checkcast(reg, obj.result(), x->klass(),
                 new_register(objectType), new_register(objectType), tmp3,
                 x->direct_compare(), info_for_exception, patching_info, stub,
!                x->profiled_method(), x->profiled_bci(), x->is_never_null());
  }
  
  
  void LIRGenerator::do_InstanceOf(InstanceOf* x) {
    LIRItem obj(x->obj(), this);