1.1 --- a/src/share/vm/adlc/output_c.cpp Tue May 18 13:45:03 2010 -0700
1.2 +++ b/src/share/vm/adlc/output_c.cpp Tue May 18 23:58:32 2010 -0700
1.3 @@ -1382,7 +1382,7 @@
1.4 inst_num, unmatched_edge);
1.5 }
1.6 // If new instruction captures bottom type
1.7 - if( root_form->captures_bottom_type() ) {
1.8 + if( root_form->captures_bottom_type(globals) ) {
1.9 // Get bottom type from instruction whose result we are replacing
1.10 fprintf(fp, " root->_bottom_type = inst%d->bottom_type();\n", inst_num);
1.11 }
1.12 @@ -2963,7 +2963,7 @@
1.13 used |= instr->define_cisc_version(*this, fp);
1.14
1.15 // Output code to convert to the short branch version, if applicable
1.16 - used |= instr->define_short_branch_methods(fp);
1.17 + used |= instr->define_short_branch_methods(*this, fp);
1.18 }
1.19
1.20 // Construct the method called by cisc_version() to copy inputs and operands.
1.21 @@ -3708,7 +3708,7 @@
1.22 }
1.23
1.24 // Fill in the bottom_type where requested
1.25 - if ( inst->captures_bottom_type() ) {
1.26 + if ( inst->captures_bottom_type(_globalNames) ) {
1.27 fprintf(fp_cpp, "%s node->_bottom_type = _leaf->bottom_type();\n", indent);
1.28 }
1.29 if( inst->is_ideal_if() ) {
1.30 @@ -3762,7 +3762,7 @@
1.31 // Create the MachNode object
1.32 fprintf(fp_cpp, " %sNode *node = new (C) %sNode();\n", name, name);
1.33 // Fill in the bottom_type where requested
1.34 - if ( this->captures_bottom_type() ) {
1.35 + if ( this->captures_bottom_type(AD.globalNames()) ) {
1.36 fprintf(fp_cpp, " node->_bottom_type = bottom_type();\n");
1.37 }
1.38
1.39 @@ -3798,7 +3798,7 @@
1.40
1.41 //---------------------------define_short_branch_methods-----------------------
1.42 // Build definitions for short branch methods
1.43 -bool InstructForm::define_short_branch_methods(FILE *fp_cpp) {
1.44 +bool InstructForm::define_short_branch_methods(ArchDesc &AD, FILE *fp_cpp) {
1.45 if (has_short_branch_form()) {
1.46 InstructForm *short_branch = short_branch_form();
1.47 const char *name = short_branch->_ident;
1.48 @@ -3813,7 +3813,7 @@
1.49 fprintf(fp_cpp, " node->_fcnt = _fcnt;\n");
1.50 }
1.51 // Fill in the bottom_type where requested
1.52 - if ( this->captures_bottom_type() ) {
1.53 + if ( this->captures_bottom_type(AD.globalNames()) ) {
1.54 fprintf(fp_cpp, " node->_bottom_type = bottom_type();\n");
1.55 }
1.56
