--- old/src/share/vm/opto/type.hpp	2017-07-14 16:33:39.261651872 +0200
+++ new/src/share/vm/opto/type.hpp	2017-07-14 16:33:39.161651877 +0200
@@ -1411,15 +1411,10 @@
   bool          _klass_is_exact;
 
 public:
-  ciSymbol* name()  const { return klass()->name(); }
-
   ciKlass* klass() const { return  _klass; }
   bool klass_is_exact()    const { return _klass_is_exact; }
 
-  bool  is_loaded() const { return klass()->is_loaded(); }
-
-  // Make a generic (unclassed) pointer to metadata.
-  static const TypeKlassPtr* make(PTR ptr, Offset offset);
+  bool  is_loaded() const { return klass() != NULL && klass()->is_loaded(); }
 
   // ptr to klass 'k'
   static const TypeKlassPtr* make(ciKlass* k) { return make( TypePtr::Constant, k, Offset(0)); }
@@ -1444,6 +1439,7 @@
   // Convenience common pre-built types.
   static const TypeKlassPtr* OBJECT; // Not-null object klass or below
   static const TypeKlassPtr* OBJECT_OR_NULL; // Maybe-null version of same
+  static const TypeKlassPtr* BOTTOM;
 #ifndef PRODUCT
   virtual void dump2( Dict &d, uint depth, outputStream *st ) const; // Specialized per-Type dumping
 #endif