*** old/src/share/vm/adlc/formssel.cpp	Tue Jul 26 19:26:51 2011
--- new/src/share/vm/adlc/formssel.cpp	Tue Jul 26 19:26:50 2011

*** 289,307 ****
--- 289,298 ----
  
    return 0;
  }
  
  
  // Return 'true' if this instruction matches an ideal 'Copy*' node
  bool InstructForm::is_ideal_unlock() const {
    return _matrule ? _matrule->is_ideal_unlock() : false;
  }
  
  bool InstructForm::is_ideal_call_leaf() const {
    return _matrule ? _matrule->is_ideal_call_leaf() : false;
  }
  
  // Return 'true' if this instruction matches an ideal 'If' node
  bool InstructForm::is_ideal_if() const {
    if( _matrule == NULL ) return false;
  
    return _matrule->is_ideal_if();

*** 1092,1101 ****
--- 1083,1095 ----
      return "MachSafePointNode";
    }
    else if (is_ideal_if()) {
      return "MachIfNode";
    }
+   else if (is_ideal_goto()) {
+     return "MachGotoNode";
+   }
    else if (is_ideal_fastlock()) {
      return "MachFastLockNode";
    }
    else if (is_ideal_nop()) {
      return "MachNopNode";

*** 2704,2714 ****
--- 2698,2707 ----
  //==============================Shared Forms===================================
  //------------------------------AttributeForm----------------------------------
  int         AttributeForm::_insId   = 0;           // start counter at 0
  int         AttributeForm::_opId    = 0;           // start counter at 0
  const char* AttributeForm::_ins_cost = "ins_cost"; // required name
  const char* AttributeForm::_ins_pc_relative = "ins_pc_relative";
  const char* AttributeForm::_op_cost  = "op_cost";  // required name
  
  AttributeForm::AttributeForm(char *attr, int type, char *attrdef)
    : Form(Form::ATTR), _attrname(attr), _atype(type), _attrdef(attrdef) {
      if (type==OP_ATTR) {

*** 3927,3949 ****
--- 3920,3929 ----
        return 1;
    }
    return 0;
  }
  
  bool MatchRule::is_ideal_unlock() const {
    if( !_opType ) return false;
    return !strcmp(_opType,"Unlock") || !strcmp(_opType,"FastUnlock");
  }
  
  
  bool MatchRule::is_ideal_call_leaf() const {
    if( !_opType ) return false;
    return !strcmp(_opType,"CallLeaf")     ||
           !strcmp(_opType,"CallLeafNoFP");
  }
  
  
  bool MatchRule::is_ideal_if() const {
    if( !_opType ) return false;
    return
      !strcmp(_opType,"If"            ) ||
      !strcmp(_opType,"CountedLoopEnd");