diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py index 5e797f038293..eee622d9abaf 100644 --- a/substratevm/mx.substratevm/suite.py +++ b/substratevm/mx.substratevm/suite.py @@ -1,4 +1,3 @@ -# pylint: disable=line-too-long suite = { "mxversion": "5.310.0", "name": "substratevm", @@ -1117,6 +1116,7 @@ "com.oracle.truffle.api.TruffleLanguage.Provider", "com.oracle.truffle.api.instrumentation.TruffleInstrument.Provider", "com.oracle.svm.hosted.agent.NativeImageBytecodeInstrumentationAgentExtension", + "com.oracle.svm.hosted.NativeImageClassLoaderPostProcessing", ], "requiresConcealed": { "jdk.internal.vm.ci": [ diff --git a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java index 15dfe314e841..0ba7f2a281aa 100644 --- a/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java +++ b/substratevm/src/com.oracle.svm.hosted.jdk11/src/com/oracle/svm/hosted/jdk11/NativeImageClassLoaderSupportJDK11OrLater.java @@ -160,7 +160,9 @@ protected Optional findModule(String moduleName) { } @Override - protected void processClassLoaderOptions(OptionValues optionValues) { + protected void processClassLoaderOptions() { + OptionValues optionValues = getParsedHostedOptions(); + processOption(optionValues, NativeImageClassLoaderOptions.AddExports).forEach(val -> { if (val.targetModules.isEmpty()) { Modules.addExportsToAllUnnamed(val.module, val.packageName); diff --git a/substratevm/src/com.oracle.svm.hosted/src/META-INF/services/com.oracle.svm.hosted.NativeImageClassLoaderPostProcessing b/substratevm/src/com.oracle.svm.hosted/src/META-INF/services/com.oracle.svm.hosted.NativeImageClassLoaderPostProcessing new file mode 100644 index 000000000000..54bf13ef209e --- /dev/null +++ b/substratevm/src/com.oracle.svm.hosted/src/META-INF/services/com.oracle.svm.hosted.NativeImageClassLoaderPostProcessing @@ -0,0 +1 @@ +com.oracle.svm.hosted.NativeImageClassLoaderOptions$ApplyNativeImageClassLoaderOptions \ No newline at end of file diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java index dcc83cecb551..779037001d97 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/AbstractNativeImageClassLoaderSupport.java @@ -118,7 +118,6 @@ public void setupHostedOptionParser(List arguments) { hostedOptionParser = new HostedOptionParser(getClassLoader()); remainingArguments = Collections.unmodifiableList((hostedOptionParser.parse(arguments))); parsedHostedOptions = new OptionValues(hostedOptionParser.getHostedValues()); - processClassLoaderOptions(parsedHostedOptions); } public HostedOptionParser getHostedOptionParser() { @@ -133,7 +132,7 @@ public OptionValues getParsedHostedOptions() { return parsedHostedOptions; } - protected abstract void processClassLoaderOptions(OptionValues optionValues); + protected abstract void processClassLoaderOptions(); public abstract void propagateQualifiedExports(String fromTargetModule, String toTargetModule); diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderOptions.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderOptions.java index 528716500e46..dfc73222cd7e 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderOptions.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderOptions.java @@ -47,4 +47,11 @@ public class NativeImageClassLoaderOptions { @Option(help = "Value " + AddReadsFormat + " updates to read , regardless of module declaration." + " can be ALL-UNNAMED to read all unnamed modules.")// public static final HostedOptionKey AddReads = new HostedOptionKey<>(new LocatableMultiOptionValue.Strings()); + + public static class ApplyNativeImageClassLoaderOptions implements NativeImageClassLoaderPostProcessing { + @Override + public void apply(AbstractNativeImageClassLoaderSupport support) { + support.processClassLoaderOptions(); + } + } } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderPostProcessing.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderPostProcessing.java new file mode 100644 index 000000000000..2a0b6677cbcc --- /dev/null +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderPostProcessing.java @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package com.oracle.svm.hosted; + +/** + * ServiceLoader interface to allow post-processing tasks that should be performed right after + * {@link AbstractNativeImageClassLoaderSupport} is created. For example, this is used to apply the + * native-image classloader options after hosted options are accessible but before + * {@com.oracle.svm.hosted.ImageClassLoader#initAllClasses()} gets called. + */ +public interface NativeImageClassLoaderPostProcessing { + + void apply(AbstractNativeImageClassLoaderSupport support); + +} diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java index d8b751e9f592..3e6d0f93f392 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java @@ -30,8 +30,6 @@ import java.util.Optional; import java.util.concurrent.ForkJoinPool; -import org.graalvm.compiler.options.OptionValues; - public class NativeImageClassLoaderSupport extends AbstractNativeImageClassLoaderSupport { NativeImageClassLoaderSupport(ClassLoader defaultSystemClassLoader, String[] classpath, @SuppressWarnings("unused") String[] modulePath) { @@ -54,7 +52,7 @@ protected Optional findModule(String moduleName) { } @Override - protected void processClassLoaderOptions(OptionValues optionValues) { + protected void processClassLoaderOptions() { /* Nothing to do for Java 8 */ } diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java index c66c8b2482bc..5828025b9463 100644 --- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java +++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java @@ -37,6 +37,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.ServiceLoader; import java.util.TimerTask; import java.util.concurrent.ForkJoinPool; import java.util.function.Consumer; @@ -177,6 +178,10 @@ public static ImageClassLoader installNativeImageClassLoader(String[] classpath, NativeImageSystemClassLoader nativeImageSystemClassLoader = NativeImageSystemClassLoader.singleton(); AbstractNativeImageClassLoaderSupport nativeImageClassLoaderSupport = createNativeImageClassLoaderSupport(nativeImageSystemClassLoader.defaultSystemClassLoader, classpath, modulepath); nativeImageClassLoaderSupport.setupHostedOptionParser(arguments); + /* Perform additional post-processing with the created nativeImageClassLoaderSupport */ + for (NativeImageClassLoaderPostProcessing postProcessing : ServiceLoader.load(NativeImageClassLoaderPostProcessing.class)) { + postProcessing.apply(nativeImageClassLoaderSupport); + } ClassLoader nativeImageClassLoader = nativeImageClassLoaderSupport.getClassLoader(); Thread.currentThread().setContextClassLoader(nativeImageClassLoader); /*