src/share/vm/adlc/output_h.cpp

*** 1491,1501 ****
      if ( instr->ideal_only() ) continue;
  
      // Build class definition for this instruction
      fprintf(fp,"\n");
      fprintf(fp,"class %sNode : public %s { \n",
!             instr->_ident, instr->mach_base_class() );
      fprintf(fp,"private:\n");
      fprintf(fp,"  MachOper *_opnd_array[%d];\n", instr->num_opnds() );
      if ( instr->is_ideal_jump() ) {
        fprintf(fp, "  GrowableArray<Label*> _index2label;\n");
      }
--- 1491,1501 ----
      if ( instr->ideal_only() ) continue;
  
      // Build class definition for this instruction
      fprintf(fp,"\n");
      fprintf(fp,"class %sNode : public %s { \n",
!             instr->_ident, instr->mach_base_class(_globalNames) );
      fprintf(fp,"private:\n");
      fprintf(fp,"  MachOper *_opnd_array[%d];\n", instr->num_opnds() );
      if ( instr->is_ideal_jump() ) {
        fprintf(fp, "  GrowableArray<Label*> _index2label;\n");
      }
*** 1564,1574 ****
  
      // Return the top-level ideal opcode.
      // Use MachNode::ideal_Opcode() for nodes based on MachNode class
      // if the ideal_Opcode == Op_Node.
      if ( strcmp("Node", instr->ideal_Opcode(_globalNames)) != 0 ||
!          strcmp("MachNode", instr->mach_base_class()) != 0 ) {
        fprintf(fp,"  virtual int            ideal_Opcode() const { return Op_%s; }\n",
              instr->ideal_Opcode(_globalNames) );
      }
  
      // Allow machine-independent optimization, invert the sense of the IF test
--- 1564,1574 ----
  
      // Return the top-level ideal opcode.
      // Use MachNode::ideal_Opcode() for nodes based on MachNode class
      // if the ideal_Opcode == Op_Node.
      if ( strcmp("Node", instr->ideal_Opcode(_globalNames)) != 0 ||
!          strcmp("MachNode", instr->mach_base_class(_globalNames)) != 0 ) {
        fprintf(fp,"  virtual int            ideal_Opcode() const { return Op_%s; }\n",
              instr->ideal_Opcode(_globalNames) );
      }
  
      // Allow machine-independent optimization, invert the sense of the IF test
*** 1629,1639 ****
  
      // Starting point for inputs matcher wants.
      // Use MachNode::oper_input_base() for nodes based on MachNode class
      // if the base == 1.
      if ( instr->oper_input_base(_globalNames) != 1 ||
!          strcmp("MachNode", instr->mach_base_class()) != 0 ) {
        fprintf(fp,"  virtual uint           oper_input_base() const { return %d; }\n",
              instr->oper_input_base(_globalNames));
      }
  
      // Make the constructor and following methods 'public:'
--- 1629,1639 ----
  
      // Starting point for inputs matcher wants.
      // Use MachNode::oper_input_base() for nodes based on MachNode class
      // if the base == 1.
      if ( instr->oper_input_base(_globalNames) != 1 ||
!          strcmp("MachNode", instr->mach_base_class(_globalNames)) != 0 ) {
        fprintf(fp,"  virtual uint           oper_input_base() const { return %d; }\n",
              instr->oper_input_base(_globalNames));
      }
  
      // Make the constructor and following methods 'public:'
*** 1904,1918 ****
        }
        // Special hack for ideal CMoveN; ideal type depends on inputs
        fprintf(fp,"  const Type            *bottom_type() const { const Type *t = in(oper_input_base()+%d)->bottom_type(); return (req() <= oper_input_base()+%d) ? t : t->meet(in(oper_input_base()+%d)->bottom_type()); } // CMoveN\n",
          offset, offset+1, offset+1);
      }
-     else if( instr->needs_base_oop_edge(_globalNames) ) {
-       // Special hack for ideal AddP.  Bottom type is an oop IFF it has a
-       // legal base-pointer input.  Otherwise it is NOT an oop.
-       fprintf(fp,"  const Type *bottom_type() const { return AddPNode::mach_bottom_type(this); } // AddP\n");
-     }
      else if (instr->is_tls_instruction()) {
        // Special hack for tlsLoadP
        fprintf(fp,"  const Type            *bottom_type() const { return TypeRawPtr::BOTTOM; } // tlsLoadP\n");
      }
      else if ( instr->is_ideal_if() ) {
--- 1904,1913 ----