*** old/src/share/vm/opto/machnode.hpp	Mon Aug  4 14:31:49 2014
--- new/src/share/vm/opto/machnode.hpp	Mon Aug  4 14:31:49 2014

*** 150,160 ****
--- 150,160 ----
    // Hash and compare over operands are currently identical
    virtual uint  hash() const;
    virtual uint  cmp( const MachOper &oper ) const;
  
    // Virtual clone, since I do not know how big the MachOper is.
-   virtual MachOper *clone(Compile* C) const = 0;
  
    // Return ideal Type from simple operands.  Fail for complex operands.
    virtual const Type *type() const;
  
    // Set an integer offset if we have one, or error otherwise

*** 200,213 ****
--- 200,213 ----
    virtual uint mach_constant_base_node_input() const { return (uint)-1; }
  
    // Copy inputs and operands to new node of instruction.
    // Called from cisc_version() and short_branch_version().
    // !!!! The method's body is defined in ad_<arch>.cpp file.
-   void fill_new_machnode(MachNode *n, Compile* C) const;
  
    // Return an equivalent instruction using memory for cisc_operand position
-   virtual MachNode *cisc_version(int offset, Compile* C);
    // Modify this instruction's register mask to use stack version for cisc_operand
    virtual void use_cisc_RegMask();
  
    // Support for short branches
    bool may_be_short_branch() const { return (flags() & Flag_may_be_short_branch) != 0; }

*** 315,325 ****
--- 315,325 ----
  
    // Call "get_base_and_disp" to decide which category of memory is used here.
    virtual const class TypePtr *adr_type() const;
  
    // Apply peephole rule(s) to this instruction
!   virtual MachNode *peephole( Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile* C );
  
    // Top-level ideal Opcode matched
    virtual int ideal_Opcode()     const { return Op_Node; }
  
    // Adds the label for the case

*** 625,635 ****
--- 625,635 ----
    }
    virtual void label_set(Label* label, uint block_num) = 0;
    virtual void save_label(Label** label, uint* block_num) = 0;
  
    // Support for short branches
-   virtual MachNode *short_branch_version(Compile* C) { return NULL; }
  
    virtual bool pinned() const { return true; };
  };
  
  //------------------------------MachNullChkNode--------------------------------

*** 983,993 ****
--- 983,993 ----
  
    labelOper(Label* label, uint block_num) : _label(label), _block_num(block_num) {}
  
    labelOper(labelOper* l) : _label(l->_label) , _block_num(l->_block_num) {}
  
-   virtual MachOper *clone(Compile* C) const;
  
    virtual Label *label() const { assert(_label != NULL, "need Label"); return _label; }
  
    virtual uint           opcode() const;
  

*** 1010,1020 ****
--- 1010,1020 ----
  public:
    intptr_t _method;             // Address of method
    methodOper() :   _method(0) {}
    methodOper(intptr_t method) : _method(method)  {}
  
-   virtual MachOper *clone(Compile* C) const;
  
    virtual intptr_t method() const { return _method; }
  
    virtual uint           opcode() const;