src/share/vm/adlc/output_h.cpp

*** 205,214 ****
--- 205,218 ----
      }
      else if (!strcmp(type, "ConN")) {
        if (i > 0) fprintf(fp,", ");
        fprintf(fp,"  const TypeNarrowOop *_c%d;\n", i);
      }
+     else if (!strcmp(type, "ConNKlass")) {
+       if (i > 0) fprintf(fp,", ");
+       fprintf(fp,"  const TypeNarrowKlass *_c%d;\n", i);
+     }
      else if (!strcmp(type, "ConL")) {
        if (i > 0) fprintf(fp,", ");
        fprintf(fp,"  jlong          _c%d;\n", i);
      }
      else if (!strcmp(type, "ConF")) {
*** 241,250 ****
--- 245,258 ----
        }
        else if (!strcmp(comp->base_type(globals), "ConN")) {
          fprintf(fp,"  const TypePtr *_c%d;\n", i);
          i++;
        }
+       else if (!strcmp(comp->base_type(globals), "ConNKlass")) {
+         fprintf(fp,"  const TypePtr *_c%d;\n", i);
+         i++;
+       }
        else if (!strcmp(comp->base_type(globals), "ConL")) {
          fprintf(fp,"  jlong            _c%d;\n", i);
          i++;
        }
        else if (!strcmp(comp->base_type(globals), "ConF")) {
*** 287,296 ****
--- 295,305 ----
      case Form::idealI : {
        fprintf(fp,is_ideal_bool ? "BoolTest::mask c%d" : "int32 c%d", i);
        break;
      }
      case Form::idealN :      { fprintf(fp,"const TypeNarrowOop *c%d", i); break; }
+     case Form::idealNKlass : { fprintf(fp,"const TypeNarrowKlass *c%d", i); break; }
      case Form::idealP :      { fprintf(fp,"const TypePtr *c%d", i); break; }
      case Form::idealL :      { fprintf(fp,"jlong c%d", i);   break;        }
      case Form::idealF :      { fprintf(fp,"jfloat c%d", i);  break;        }
      case Form::idealD :      { fprintf(fp,"jdouble c%d", i); break;        }
      default:
*** 314,323 ****
--- 323,337 ----
        else if (!strcmp(comp->base_type(globals), "ConN")) {
          if (i > 0) fprintf(fp,", ");
          fprintf(fp,"const TypePtr *c%d", i);
          i++;
        }
+       else if (!strcmp(comp->base_type(globals), "ConNKlass")) {
+         if (i > 0) fprintf(fp,", ");
+         fprintf(fp,"const TypePtr *c%d", i);
+         i++;
+       }
        else if (!strcmp(comp->base_type(globals), "ConL")) {
          if (i > 0) fprintf(fp,", ");
          fprintf(fp,"jlong c%d", i);
          i++;
        }
*** 378,387 ****
--- 392,405 ----
    }
    else if (!strcmp(ideal_type, "ConN")) {
      fprintf(fp,"    _c%d->dump_on(st);\n", i);
      ++i;
    }
+   else if (!strcmp(ideal_type, "ConNKlass")) {
+     fprintf(fp,"    _c%d->dump_on(st);\n", i);
+     ++i;
+   }
    else if (!strcmp(ideal_type, "ConL")) {
      fprintf(fp,"    st->print(\"#\" INT64_FORMAT, _c%d);\n", i);
      ++i;
    }
    else if (!strcmp(ideal_type, "ConF")) {
*** 1237,1247 ****
        fprintf(fp,"  virtual const Type *type() const {");
        const char *type = getIdealType(optype);
        if( type != NULL ) {
          Form::DataType data_type = oper->is_base_constant(_globalNames);
          // Check if we are an ideal pointer type
!         if( data_type == Form::idealP || data_type == Form::idealN ) {
            // Return the ideal type we already have: <TypePtr *>
            fprintf(fp," return _c0;");
          } else {
            // Return the appropriate bottom type
            fprintf(fp," return %s;", getIdealType(optype));
--- 1255,1265 ----
        fprintf(fp,"  virtual const Type *type() const {");
        const char *type = getIdealType(optype);
        if( type != NULL ) {
          Form::DataType data_type = oper->is_base_constant(_globalNames);
          // Check if we are an ideal pointer type
!         if( data_type == Form::idealP || data_type == Form::idealN || data_type == Form::idealNKlass ) {
            // Return the ideal type we already have: <TypePtr *>
            fprintf(fp," return _c0;");
          } else {
            // Return the appropriate bottom type
            fprintf(fp," return %s;", getIdealType(optype));
*** 1375,1384 ****
--- 1393,1412 ----
            // Generate query to determine if this pointer is an oop
            fprintf(fp,"  virtual relocInfo::relocType           constant_reloc() const {");
            fprintf(fp,   " return _c0->get_ptrtype()->reloc();");
            fprintf(fp, " }\n");
          }
+         else if (!strcmp(oper->ideal_type(_globalNames), "ConNKlass")) {
+           // Access the locally stored constant
+           fprintf(fp,"  virtual intptr_t       constant() const {");
+           fprintf(fp,   " return _c0->get_ptrtype()->get_con();");
+           fprintf(fp, " }\n");
+           // Generate query to determine if this pointer is an oop
+           fprintf(fp,"  virtual relocInfo::relocType           constant_reloc() const {");
+           fprintf(fp,   " return _c0->get_ptrtype()->reloc();");
+           fprintf(fp, " }\n");
+         }
          else if (!strcmp(oper->ideal_type(_globalNames), "ConL")) {
            fprintf(fp,"  virtual intptr_t       constant() const {");
            // We don't support addressing modes with > 4Gig offsets.
            // Truncate to int.
            fprintf(fp,   "  return (intptr_t)_c0;");
*** 1808,1817 ****
--- 1836,1846 ----
        case Form::idealI:
          fprintf(fp,"    return  TypeInt::make(opnd_array(1)->constant());\n");
          break;
        case Form::idealP:
        case Form::idealN:
+       case Form::idealNKlass:
          fprintf(fp,"    return  opnd_array(1)->type();\n");
          break;
        case Form::idealD:
          fprintf(fp,"    return  TypeD::make(opnd_array(1)->constantD());\n");
          break;