src/share/vm/opto/loopnode.hpp

rev 5781 : 8173770: Image conversion improvements
Reviewed-by: kvn, vlivanov, dlong, rhalade, mschoene, iignatyev
rev 5783 : 8024069: replace_in_map() should operate on parent maps
Summary: type information gets lost because replace_in_map() doesn't update parent maps
Reviewed-by: kvn, twisti

*** 875,891 ****
    bool is_scaled_iv(Node* exp, Node* iv, int* p_scale);
  
    // Return true if exp is a scaled induction var plus (or minus) constant
    bool is_scaled_iv_plus_offset(Node* exp, Node* iv, int* p_scale, Node** p_offset, int depth = 0);
  
-   // Return true if proj is for "proj->[region->..]call_uct"
-   static bool is_uncommon_trap_proj(ProjNode* proj, Deoptimization::DeoptReason reason);
-   // Return true for    "if(test)-> proj -> ...
-   //                          |
-   //                          V
-   //                      other_proj->[region->..]call_uct"
-   static bool is_uncommon_trap_if_pattern(ProjNode* proj, Deoptimization::DeoptReason reason);
    // Create a new if above the uncommon_trap_if_pattern for the predicate to be promoted
    ProjNode* create_new_if_for_predicate(ProjNode* cont_proj, Node* new_entry,
                                          Deoptimization::DeoptReason reason);
    void register_control(Node* n, IdealLoopTree *loop, Node* pred);
  
--- 875,884 ----
*** 908,919 ****
    // Find a predicate
    static Node* find_predicate(Node* entry);
    // Construct a range check for a predicate if
    BoolNode* rc_predicate(IdealLoopTree *loop, Node* ctrl,
                           int scale, Node* offset,
!                          Node* init, Node* limit, Node* stride,
!                          Node* range, bool upper);
  
    // Implementation of the loop predication to promote checks outside the loop
    bool loop_predication_impl(IdealLoopTree *loop);
  
    // Helper function to collect predicate for eliminating the useless ones
--- 901,912 ----
    // Find a predicate
    static Node* find_predicate(Node* entry);
    // Construct a range check for a predicate if
    BoolNode* rc_predicate(IdealLoopTree *loop, Node* ctrl,
                           int scale, Node* offset,
!                          Node* init, Node* limit, jint stride,
!                          Node* range, bool upper, bool &overflow);
  
    // Implementation of the loop predication to promote checks outside the loop
    bool loop_predication_impl(IdealLoopTree *loop);
  
    // Helper function to collect predicate for eliminating the useless ones