--- a/hotspot/src/share/vm/oops/constantPool.hpp	Wed Mar 15 11:44:46 2017 +0100
+++ b/hotspot/src/share/vm/oops/constantPool.hpp	Wed Mar 15 10:25:37 2017 -0400
@@ -693,7 +693,7 @@
   }
 
   // Klass name matches name at offset
-  bool klass_name_at_matches(instanceKlassHandle k, int which);
+  bool klass_name_at_matches(const InstanceKlass* k, int which);
 
   // Sizing
   int length() const                   { return _length; }
@@ -784,7 +784,7 @@
   }
 
   // Performs the LinkResolver checks
-  static void verify_constant_pool_resolve(const constantPoolHandle& this_cp, KlassHandle klass, TRAPS);
+  static void verify_constant_pool_resolve(const constantPoolHandle& this_cp, Klass* klass, TRAPS);
 
   // Implementation of methods that needs an exposed 'this' pointer, in order to
   // handle GC while executing the method
@@ -792,7 +792,7 @@
                               bool save_resolution_error, TRAPS);
   static oop string_at_impl(const constantPoolHandle& this_cp, int which, int obj_index, TRAPS);
 
-  static void trace_class_resolution(const constantPoolHandle& this_cp, KlassHandle k);
+  static void trace_class_resolution(const constantPoolHandle& this_cp, Klass* k);
 
   // Resolve string constants (to prevent allocation during compilation)
   static void resolve_string_constants_impl(const constantPoolHandle& this_cp, TRAPS);