Use hosted ServicesCatalog.CLV when querying PlatformClassLoader CLV

Author: ivan-ristovic

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/RuntimeClassLoaderValueSupport.java

@@ -81,6 +81,9 @@ public static RuntimeClassLoaderValueSupport instance() {
     @Platforms(Platform.HOSTED_ONLY.class) //
     private final Field classLoaderCLVField = ReflectionUtil.lookupField(ClassLoader.class, "classLoaderValueMap");
 
+    @Platforms(Platform.HOSTED_ONLY.class) //
+    private final ClassLoaderValue<ServicesCatalog> hostedServicesCatalogCLV = ReflectionUtil.readField(ServicesCatalog.class, "CLV", null);
+
     @Platforms(Platform.HOSTED_ONLY.class) //
     public ConcurrentHashMap<?, ?> getClassLoaderValueMapForLoader(ClassLoader loader) {
         if (loader == null) {
@@ -159,7 +162,7 @@ public void registerServicesCatalog(ClassLoader loader) {
     public ServicesCatalog getHostedServiceCatalogForLoader(ClassLoader loader) {
         try {
             ConcurrentHashMap<?, ?> hostedLoaderCLV = (ConcurrentHashMap<?, ?>) classLoaderCLVField.get(loader);
-            ServicesCatalog servicesCatalog = (ServicesCatalog) hostedLoaderCLV.get(servicesCatalogCLV);
+            ServicesCatalog servicesCatalog = (ServicesCatalog) hostedLoaderCLV.get(hostedServicesCatalogCLV);
             return servicesCatalog;
         } catch (IllegalAccessException e) {
             throw VMError.shouldNotReachHere("Failed to query ClassLoader.classLoaderValueMap", e);