*** old/src/share/vm/opto/phaseX.hpp	Tue Nov 24 15:25:44 2015
--- new/src/share/vm/opto/phaseX.hpp	Tue Nov 24 15:25:44 2015

*** 133,142 ****
--- 133,144 ----
    Type_Array(Type_Array *ta) : _a(ta->_a), _max(ta->_max), _types(ta->_types) { }
    const Type *fast_lookup(uint i) const{assert(i<_max,"oob");return _types[i];}
    // Extend the mapping: index i maps to Type *n.
    void map( uint i, const Type *n ) { if( i>=_max ) grow(i); _types[i] = n; }
    uint Size() const { return _max; }
+   void replace_with(Type_Array* ta);
+ 
  #ifndef PRODUCT
    void dump() const;
  #endif
  };
  

*** 146,160 ****
--- 148,170 ----
  class PhaseRemoveUseless : public Phase {
  protected:
    Unique_Node_List _useful;   // Nodes reachable from root
                                // list is allocated from current resource area
  public:
!   PhaseRemoveUseless( PhaseGVN *gvn, Unique_Node_List *worklist );
!   PhaseRemoveUseless(PhaseGVN *gvn, Unique_Node_List *worklist, PhaseNumber phase_num = Remove_Useless);
  
    Unique_Node_List *get_useful() { return &_useful; }
  };
  
+ //------------------------------PhaseRenumber----------------------------------
+ // Phase that first performs a PhaseRemoveUseless, then it renumbers compiler
+ // structures accordingly.
+ class PhaseRenumberLive : public PhaseRemoveUseless {
+ public:
+   PhaseRenumberLive(PhaseGVN* gvn, Unique_Node_List* worklist, PhaseNumber phase_num = Renumber_Live);
+ };
+ 
  
  //------------------------------PhaseTransform---------------------------------
  // Phases that analyze, then transform.  Constructing the Phase object does any
  // global or slow analysis.  The results are cached later for a fast
  // transformation pass.  When the Phase object is deleted the cached analysis