Fix MissingResourceRegistration behaviour for resource bundle access via module

Author: olpaw

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_java_util_ResourceBundle.java

@@ -25,7 +25,10 @@
 package com.oracle.svm.core.jdk.localization.substitutions;
 
 import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.Objects;
 import java.util.ResourceBundle;
+import java.util.ResourceBundle.Control;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Supplier;
@@ -115,7 +118,7 @@ private static ResourceBundle getBundleImpl(String baseName,
         // get resource bundles for a named module only if loader is the module's class loader
         if (callerModule.isNamed() && loader == getLoader(callerModule)) {
             if (!ImageSingletons.lookup(LocalizationSupport.class).isRegisteredBundleLookup(baseName, locale, control)) {
-                MissingResourceRegistrationUtils.reportResourceBundleAccess(baseName);
+                MissingResourceRegistrationUtils.reportResourceBundleAccess(callerModule, baseName);
             }
             return MissingRegistrationUtils.runIgnoringMissingRegistrations(new Supplier<ResourceBundle>() {
                 @Override
@@ -134,7 +137,7 @@ public ResourceBundle get() {
                         : BootLoader.getUnnamedModule();
 
         if (!ImageSingletons.lookup(LocalizationSupport.class).isRegisteredBundleLookup(baseName, locale, control)) {
-            MissingResourceRegistrationUtils.reportResourceBundleAccess(baseName);
+            MissingResourceRegistrationUtils.reportResourceBundleAccess(unnamedModule, baseName);
         }
         return MissingRegistrationUtils.runIgnoringMissingRegistrations(new Supplier<ResourceBundle>() {
             @Override
@@ -144,6 +147,22 @@ public ResourceBundle get() {
         });
     }
 
+    @Substitute
+    private static ResourceBundle getBundleFromModule(Class<?> caller,
+                    Module module,
+                    String baseName,
+                    Locale locale,
+                    Control control) {
+        Objects.requireNonNull(module);
+        Module callerModule = getCallerModule(caller);
+        try {
+            return MissingRegistrationUtils.runIgnoringMissingRegistrations(() -> getBundleImpl(callerModule, module, baseName, locale, control));
+        } catch (MissingResourceException mre) {
+            MissingResourceRegistrationUtils.reportResourceBundleAccess(module, baseName);
+            throw mre;
+        }
+    }
+
     @Alias
     private static native Module getCallerModule(Class<?> caller);
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/MissingResourceRegistrationUtils.java

@@ -29,6 +29,7 @@
 import java.nio.file.Files;
 import java.nio.file.spi.FileSystemProvider;
 import java.util.Map;
+import java.util.Objects;
 import java.util.ResourceBundle;
 import java.util.Set;
 
@@ -61,16 +62,18 @@ public static void reportResourceAccess(Module module, String resourcePath) {
         report(exception);
     }
 
-    public static void reportResourceBundleAccess(String baseName) {
+    public static void reportResourceBundleAccess(Module module, String baseName) {
         var bundleConfig = new ResourceConfiguration.BundleConfiguration(UnresolvedConfigurationCondition.alwaysTrue(), baseName);
         StringWriter json = new StringWriter();
         try {
             ResourceConfiguration.printResourceBundle(bundleConfig, getJSONWriter(json), true);
         } catch (IOException e) {
             throw VMError.shouldNotReachHere("In memory JSON printing should not fail");
         }
+        Objects.requireNonNull(module);
+        String moduleMessage = module.isNamed() ? " from module " + quote(module.getName()) : "";
         MissingResourceRegistrationError exception = new MissingResourceRegistrationError(
-                        resourceError("resource bundle with name " + quote(baseName), json.toString(), "resource-bundles"),
+                        resourceError("resource bundle" + moduleMessage + " with name " + quote(baseName), json.toString(), "resource-bundles"),
                         baseName);
         report(exception);
     }