--- 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
@@ -714,7 +714,7 @@
   static const TypeOopPtr* make_from_constant(ciObject* o);
 
   // Make a generic (unclassed) pointer to an oop.
-  static const TypeOopPtr* make(PTR ptr, int offset);
+  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;     }
@@ -748,6 +748,7 @@
   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;