*** old/src/share/vm/adlc/output_h.cpp	Mon May  5 12:28:36 2014
--- new/src/share/vm/adlc/output_h.cpp	Mon May  5 12:28:34 2014

*** 209,219 ****
--- 209,219 ----
    if ((comp = oper->_components.iter()) == NULL) {
      assert(oper->num_consts(globals) == 1, "Bad component list detected.\n");
      const char *type = oper->ideal_type(globals);
      if (!strcmp(type, "ConI")) {
        if (i > 0) fprintf(fp,", ");
!       fprintf(fp,"  int32          _c%d;\n", i);
!       fprintf(fp,"  int32_t        _c%d;\n", i);
      }
      else if (!strcmp(type, "ConP")) {
        if (i > 0) fprintf(fp,", ");
        fprintf(fp,"  const TypePtr *_c%d;\n", i);
      }

*** 305,315 ****
--- 305,315 ----
    lst.reset();
    if ((comp = lst.iter()) == NULL) {
      assert(num_consts == 1, "Bad component list detected.\n");
      switch( constant_type ) {
      case Form::idealI : {
!       fprintf(fp,is_ideal_bool ? "BoolTest::mask c%d" : "int32_t 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; }

*** 324,334 ****
--- 324,334 ----
    else {
      lst.reset();
      while((comp = lst.iter()) != NULL) {
        if (!strcmp(comp->base_type(globals), "ConI")) {
          if (i > 0) fprintf(fp,", ");
!         fprintf(fp,"int32_t c%d", i);
          i++;
        }
        else if (!strcmp(comp->base_type(globals), "ConP")) {
          if (i > 0) fprintf(fp,", ");
          fprintf(fp,"const TypePtr *c%d", i);