--- a/src/hotspot/share/runtime/reflectionUtils.cpp	Tue Aug 07 16:07:47 2018 -0700
+++ b/src/hotspot/share/runtime/reflectionUtils.cpp	Tue Aug 07 15:45:07 2018 -0700
@@ -33,7 +33,7 @@
   _base_class_search_defaults = false;
   _defaults_checked = false;
   if (classes_only) {
-    _interfaces = Universe::the_empty_klass_array();
+    _interfaces = Universe::the_empty_instance_klass_array();
   } else {
     _interfaces = klass->transitive_interfaces();
   }
@@ -48,7 +48,7 @@
   if (_local_only) return true;
   if (!_klass->is_interface() && _klass->super() != NULL) {
     // go up superclass chain (not for interfaces)
-    _klass = InstanceKlass::cast(_klass->super());
+    _klass = _klass->java_super();
   // Next for method walks, walk default methods
   } else if (_walk_defaults && (_defaults_checked == false)  && (_base_klass->default_methods() != NULL)) {
       _base_class_search_defaults = true;
@@ -57,7 +57,7 @@
   } else {
     // Next walk transitive interfaces
     if (_interface_index > 0) {
-      _klass = InstanceKlass::cast(_interfaces->at(--_interface_index));
+      _klass = _interfaces->at(--_interface_index);
     } else {
       return true;
     }