*** old/src/share/vm/opto/type.hpp	Wed Sep  9 15:18:53 2009
--- new/src/share/vm/opto/type.hpp	Wed Sep  9 15:18:53 2009

*** 712,722 ****
--- 712,722 ----
    }
    // Creates a singleton type given an object.
    static const TypeOopPtr* make_from_constant(ciObject* o);
  
    // Make a generic (unclassed) pointer to an oop.
!   static const TypeOopPtr* make(PTR ptr, int offset, int instance_id = InstanceBot);
  
    ciObject* const_oop()    const { return _const_oop; }
    virtual ciKlass* klass() const { return _klass;     }
    bool klass_is_exact()    const { return _klass_is_exact; }
  

*** 746,755 ****
--- 746,756 ----
  
    // Do not allow interface-vs.-noninterface joins to collapse to top.
    virtual const Type *filter( const Type *kills ) const;
  
    // Convenience common pre-built type.
+   static const TypeOopPtr *NOTNULL;
    static const TypeOopPtr *BOTTOM;
  #ifndef PRODUCT
    virtual void dump2( Dict &d, uint depth, outputStream *st ) const;
  #endif
  };