*** old/src/share/vm/adlc/archDesc.cpp	Tue Jul 26 19:26:47 2011
--- new/src/share/vm/adlc/archDesc.cpp	Tue Jul 26 19:26:46 2011

*** 333,342 ****
--- 333,345 ----
  
      Attribute *attr = instr->_attribs;
      while (attr != NULL) {
        if (strcmp(attr->_ident,"ins_short_branch") == 0 &&
            attr->int_val(*this) != 0) {
+         if (!instr->is_ideal_branch() || instr->label_position() == -1) {
+           syntax_err(instr->_linenum, "%s: Only short branch to a label is supported\n", rootOp);
+         }
          instr->set_short_branch(true);
        } else if (strcmp(attr->_ident,"ins_alignment") == 0 &&
            attr->int_val(*this) != 0) {
          instr->set_alignment(attr->int_val(*this));
        }