src/share/vm/opto/type.hpp

*** 607,626 ****
  // Class of Tuple Types, essentially type collections for function signatures
  // and class layouts.  It happens to also be a fast cache for the HotSpot
  // signature types.
  class TypeTuple : public Type {
    TypeTuple( uint cnt, const Type **fields ) : Type(Tuple), _cnt(cnt), _fields(fields) { }
  public:
    virtual bool eq( const Type *t ) const;
    virtual int  hash() const;             // Type specific hashing
    virtual bool singleton(void) const;    // TRUE if type is a singleton
    virtual bool empty(void) const;        // TRUE if type is vacuous
  
- public:
-   const uint          _cnt;              // Count of fields
-   const Type ** const _fields;           // Array of field types
- 
    // Accessors:
    uint cnt() const { return _cnt; }
    const Type* field_at(uint i) const {
      assert(i < _cnt, "oob");
      return _fields[i];
--- 607,626 ----
  // Class of Tuple Types, essentially type collections for function signatures
  // and class layouts.  It happens to also be a fast cache for the HotSpot
  // signature types.
  class TypeTuple : public Type {
    TypeTuple( uint cnt, const Type **fields ) : Type(Tuple), _cnt(cnt), _fields(fields) { }
+ 
+   const uint          _cnt;              // Count of fields
+   const Type ** const _fields;           // Array of field types
+ 
  public:
    virtual bool eq( const Type *t ) const;
    virtual int  hash() const;             // Type specific hashing
    virtual bool singleton(void) const;    // TRUE if type is a singleton
    virtual bool empty(void) const;        // TRUE if type is vacuous
  
    // Accessors:
    uint cnt() const { return _cnt; }
    const Type* field_at(uint i) const {
      assert(i < _cnt, "oob");
      return _fields[i];
*** 1445,1466 ****
    TypeFunc( const TypeTuple *domain, const TypeTuple *range ) : Type(Function),  _domain(domain), _range(range) {}
    virtual bool eq( const Type *t ) const;
    virtual int  hash() const;             // Type specific hashing
    virtual bool singleton(void) const;    // TRUE if type is a singleton
    virtual bool empty(void) const;        // TRUE if type is vacuous
  public:
    // Constants are shared among ADLC and VM
    enum { Control    = AdlcVMDeps::Control,
           I_O        = AdlcVMDeps::I_O,
           Memory     = AdlcVMDeps::Memory,
           FramePtr   = AdlcVMDeps::FramePtr,
           ReturnAdr  = AdlcVMDeps::ReturnAdr,
           Parms      = AdlcVMDeps::Parms
    };
  
-   const TypeTuple* const _domain;     // Domain of inputs
-   const TypeTuple* const _range;      // Range of results
  
    // Accessors:
    const TypeTuple* domain() const { return _domain; }
    const TypeTuple* range()  const { return _range; }
  
--- 1445,1468 ----
    TypeFunc( const TypeTuple *domain, const TypeTuple *range ) : Type(Function),  _domain(domain), _range(range) {}
    virtual bool eq( const Type *t ) const;
    virtual int  hash() const;             // Type specific hashing
    virtual bool singleton(void) const;    // TRUE if type is a singleton
    virtual bool empty(void) const;        // TRUE if type is vacuous
+ 
+   const TypeTuple* const _domain;     // Domain of inputs
+   const TypeTuple* const _range;      // Range of results
+ 
  public:
    // Constants are shared among ADLC and VM
    enum { Control    = AdlcVMDeps::Control,
           I_O        = AdlcVMDeps::I_O,
           Memory     = AdlcVMDeps::Memory,
           FramePtr   = AdlcVMDeps::FramePtr,
           ReturnAdr  = AdlcVMDeps::ReturnAdr,
           Parms      = AdlcVMDeps::Parms
    };
  
  
    // Accessors:
    const TypeTuple* domain() const { return _domain; }
    const TypeTuple* range()  const { return _range; }