1.1 --- a/src/share/vm/adlc/output_h.cpp Mon Jul 23 13:04:59 2012 -0700
1.2 +++ b/src/share/vm/adlc/output_h.cpp Tue Jul 24 10:51:00 2012 -0700
1.3 @@ -674,16 +674,19 @@
1.4 else if( inst.is_ideal_mem() ) {
1.5 // Print out the field name if available to improve readability
1.6 fprintf(fp, " if (ra->C->alias_type(adr_type())->field() != NULL) {\n");
1.7 - fprintf(fp, " st->print(\" ! Field \");\n");
1.8 - fprintf(fp, " if( ra->C->alias_type(adr_type())->is_volatile() )\n");
1.9 - fprintf(fp, " st->print(\" Volatile\");\n");
1.10 - fprintf(fp, " ra->C->alias_type(adr_type())->field()->holder()->name()->print_symbol_on(st);\n");
1.11 + fprintf(fp, " ciField* f = ra->C->alias_type(adr_type())->field();\n");
1.12 + fprintf(fp, " st->print(\" ! Field: \");\n");
1.13 + fprintf(fp, " if (f->is_volatile())\n");
1.14 + fprintf(fp, " st->print(\"volatile \");\n");
1.15 + fprintf(fp, " f->holder()->name()->print_symbol_on(st);\n");
1.16 fprintf(fp, " st->print(\".\");\n");
1.17 - fprintf(fp, " ra->C->alias_type(adr_type())->field()->name()->print_symbol_on(st);\n");
1.18 + fprintf(fp, " f->name()->print_symbol_on(st);\n");
1.19 + fprintf(fp, " if (f->is_constant())\n");
1.20 + fprintf(fp, " st->print(\" (constant)\");\n");
1.21 fprintf(fp, " } else\n");
1.22 // Make sure 'Volatile' gets printed out
1.23 - fprintf(fp, " if( ra->C->alias_type(adr_type())->is_volatile() )\n");
1.24 - fprintf(fp, " st->print(\" Volatile!\");\n");
1.25 + fprintf(fp, " if (ra->C->alias_type(adr_type())->is_volatile())\n");
1.26 + fprintf(fp, " st->print(\" volatile!\");\n");
1.27 }
1.28
1.29 // Complete the definition of the format function
