src/share/vm/adlc/formssel.cpp

*** 338,353 ****
    if( _matrule == NULL ) return false;
  
    return _matrule->is_ideal_jump();
  }
  
! // Return 'true' if instruction matches ideal 'If' | 'Goto' |
! //                    'CountedLoopEnd' | 'Jump'
  bool InstructForm::is_ideal_branch() const {
    if( _matrule == NULL ) return false;
  
!   return _matrule->is_ideal_if() || _matrule->is_ideal_goto() || _matrule->is_ideal_jump();
  }
  
  
  // Return 'true' if this instruction matches an ideal 'Return' node
  bool InstructForm::is_ideal_return() const {
--- 338,352 ----
    if( _matrule == NULL ) return false;
  
    return _matrule->is_ideal_jump();
  }
  
! // Return 'true' if instruction matches ideal 'If' | 'Goto' | 'CountedLoopEnd'
  bool InstructForm::is_ideal_branch() const {
    if( _matrule == NULL ) return false;
  
!   return _matrule->is_ideal_if() || _matrule->is_ideal_goto();
  }
  
  
  // Return 'true' if this instruction matches an ideal 'Return' node
  bool InstructForm::is_ideal_return() const {
*** 381,391 ****
  }
  
  bool InstructForm::is_ideal_control() const {
    if ( ! _matrule)  return false;
  
!   return is_ideal_return() || is_ideal_branch() || is_ideal_halt();
  }
  
  // Return 'true' if this instruction matches an ideal 'Call' node
  Form::CallType InstructForm::is_ideal_call() const {
    if( _matrule == NULL ) return Form::invalid_type;
--- 380,390 ----
  }
  
  bool InstructForm::is_ideal_control() const {
    if ( ! _matrule)  return false;
  
!   return is_ideal_return() || is_ideal_branch() || _matrule->is_ideal_jump() || is_ideal_halt();
  }
  
  // Return 'true' if this instruction matches an ideal 'Call' node
  Form::CallType InstructForm::is_ideal_call() const {
    if( _matrule == NULL ) return Form::invalid_type;