src/hotspot/share/opto/ifnode.cpp

rev 48500 : 8194988: 8 Null pointer dereference defect groups related to MultiNode::proj_out()

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 503,513 ****
  
    // We have recognized one of these forms:
    //  Flip 1:  If (Bool[<] CmpU(l, LoadRange)) ...
    //  Flip 2:  If (Bool[<=] CmpU(LoadRange, l)) ...
  
!   ProjNode* iftrap = proj_out(flip_test == 2 ? true : false);
    return iftrap;
  }
  
  
  //------------------------------is_range_check---------------------------------
--- 503,513 ----
  
    // We have recognized one of these forms:
    //  Flip 1:  If (Bool[<] CmpU(l, LoadRange)) ...
    //  Flip 2:  If (Bool[<=] CmpU(LoadRange, l)) ...
  
!   ProjNode* iftrap = proj_out_or_null(flip_test == 2 ? true : false);
    return iftrap;
  }
  
  
  //------------------------------is_range_check---------------------------------
*** 1469,1479 ****
  
    // Loop predicates may have depending checks which should not
    // be skipped. For example, range check predicate has two checks
    // for lower and upper bounds.
    ProjNode* unc_proj = proj_out(1 - prev_dom->as_Proj()->_con)->as_Proj();
!   if ((unc_proj != NULL) && (unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_predicate) != NULL)) {
      prev_dom = idom;
    }
  
    // Now walk the current IfNode's projections.
    // Loop ends when 'this' has no more uses.
--- 1469,1479 ----
  
    // Loop predicates may have depending checks which should not
    // be skipped. For example, range check predicate has two checks
    // for lower and upper bounds.
    ProjNode* unc_proj = proj_out(1 - prev_dom->as_Proj()->_con)->as_Proj();
!   if (unc_proj->is_uncommon_trap_proj(Deoptimization::Reason_predicate) != NULL) {
      prev_dom = idom;
    }
  
    // Now walk the current IfNode's projections.
    // Loop ends when 'this' has no more uses.