--- old/src/hotspot/share/interpreter/linkResolver.cpp	2020-07-31 16:51:28.437980256 +0000
+++ new/src/hotspot/share/interpreter/linkResolver.cpp	2020-07-31 16:51:26.882404049 +0000
@@ -328,7 +328,7 @@
   Symbol* signature = link_info.signature();
 
   // Ignore overpasses so statics can be found during resolution
-  Method* result = klass->uncached_lookup_method(name, signature, Klass::skip_overpass);
+  Method* result = klass->uncached_lookup_method(name, signature, Klass::OverpassLookupMode::skip_overpass);
 
   if (klass->is_array_klass()) {
     // Only consider klass and super klass for arrays
@@ -377,11 +377,11 @@
                                                         Symbol* name,
                                                         Symbol* signature,
                                                         Klass::PrivateLookupMode private_mode, TRAPS) {
-  Method* result = klass->uncached_lookup_method(name, signature, Klass::find_overpass, private_mode);
+  Method* result = klass->uncached_lookup_method(name, signature, Klass::OverpassLookupMode::find_overpass, private_mode);
 
   while (result != NULL && result->is_static() && result->method_holder()->super() != NULL) {
     Klass* super_klass = result->method_holder()->super();
-    result = super_klass->uncached_lookup_method(name, signature, Klass::find_overpass, private_mode);
+    result = super_klass->uncached_lookup_method(name, signature, Klass::OverpassLookupMode::find_overpass, private_mode);
   }
 
   if (klass->is_array_klass()) {
@@ -410,8 +410,10 @@
   // First check in default method array
   if (!resolved_method->is_abstract() && ik->default_methods() != NULL) {
     int index = InstanceKlass::find_method_index(ik->default_methods(),
-                                                 name, signature, Klass::find_overpass,
-                                                 Klass::find_static, Klass::find_private);
+                                                 name, signature,
+                                                 Klass::OverpassLookupMode::find_overpass,
+                                                 Klass::StaticLookupMode::find_static,
+                                                 Klass::PrivateLookupMode::find_private);
     if (index >= 0 ) {
       vtable_index = ik->default_vtable_indices()->at(index);
     }
@@ -430,7 +432,7 @@
   // Specify 'true' in order to skip default methods when searching the
   // interfaces.  Function lookup_method_in_klasses() already looked for
   // the method in the default methods table.
-  return ik->lookup_method_in_all_interfaces(cp_info.name(), cp_info.signature(), Klass::skip_defaults);
+  return ik->lookup_method_in_all_interfaces(cp_info.name(), cp_info.signature(), Klass::DefaultsLookupMode::skip_defaults);
 }
 
 Method* LinkResolver::lookup_polymorphic_method(const LinkInfo& link_info,
@@ -1087,7 +1089,7 @@
     // Use updated LinkInfo to reresolve with resolved method holder
     LinkInfo new_info(resolved_klass, link_info.name(), link_info.signature(),
                       link_info.current_klass(),
-                      link_info.check_access() ? LinkInfo::needs_access_check : LinkInfo::skip_access_check);
+                      link_info.check_access() ? LinkInfo::AccessCheck::needs_access_check : LinkInfo::AccessCheck::skip_access_check);
     resolved_method = linktime_resolve_static_method(new_info, CHECK);
   }
 
@@ -1236,7 +1238,7 @@
       Method* instance_method = lookup_instance_method_in_klasses(super_klass,
                                                      resolved_method->name(),
                                                      resolved_method->signature(),
-                                                     Klass::find_private, CHECK);
+                                                     Klass::PrivateLookupMode::find_private, CHECK);
       sel_method = methodHandle(THREAD, instance_method);
 
       // check if found
@@ -1478,7 +1480,7 @@
     Method* method = lookup_instance_method_in_klasses(recv_klass,
                                                        resolved_method->name(),
                                                        resolved_method->signature(),
-                                                       Klass::skip_private, CHECK);
+                                                       Klass::PrivateLookupMode::skip_private, CHECK);
     selected_method = methodHandle(THREAD, method);
 
     if (selected_method.is_null() && !check_null_and_abstract) {