src/share/vm/adlc/output_h.cpp

*** 1517,1528 ****
  
      // If this instruction contains a labelOper
      // Declare Node::methods that set operand Label's contents
      int label_position = instr->label_position();
      if( label_position != -1 ) {
!       // Set the label, stored in labelOper::_branch_label
        fprintf(fp,"  virtual void           label_set( Label* label, uint block_num );\n");
      }
  
      // If this instruction contains a methodOper
      // Declare Node::methods that set operand method's contents
      int method_position = instr->method_position();
--- 1517,1529 ----
  
      // If this instruction contains a labelOper
      // Declare Node::methods that set operand Label's contents
      int label_position = instr->label_position();
      if( label_position != -1 ) {
!       // Set/Save the label, stored in labelOper::_branch_label
        fprintf(fp,"  virtual void           label_set( Label* label, uint block_num );\n");
+       fprintf(fp,"  virtual void           save_label( Label** label, uint* block_num );\n");
      }
  
      // If this instruction contains a methodOper
      // Declare Node::methods that set operand method's contents
      int method_position = instr->method_position();
*** 1674,1693 ****
          fprintf(fp," | Flag_is_Con");
        } else {
          fprintf(fp,"init_flags(Flag_is_Con");
          node_flags_set = true;
        }
-     }
- 
-     // flag: if instruction matches 'If' | 'Goto' | 'CountedLoopEnd | 'Jump'
-     if ( instr->is_ideal_branch() ) {
-       if ( node_flags_set ) {
-         fprintf(fp," | Flag_is_Branch");
-       } else {
-         fprintf(fp,"init_flags(Flag_is_Branch");
-         node_flags_set = true;
-       }
      }
  
      // flag: if this instruction is cisc alternate
      if ( can_cisc_spill() && instr->is_cisc_alternate() ) {
        if ( node_flags_set ) {
--- 1675,1684 ----