Skip to content

Commit 8ac8e30

Browse files
committed
rename jdk.graal.nativeimage to org.graalvm.nativeimage.libgraal
1 parent 9ec1aec commit 8ac8e30

File tree

30 files changed

+84
-82
lines changed

30 files changed

+84
-82
lines changed

compiler/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This changelog summarizes newly introduced optimizations and other compiler related changes.
44

55
## GraalVM for JDK 25 (Internal Version 25.0.0)
6-
* (GR-60088): This PR adds the `jdk.graal.nativeimage` SDK module. With this module, all logic for building
6+
* (GR-60088): This PR adds the `org.graalvm.nativeimage.libgraal` SDK module. With this module, all logic for building
77
libgraal has been moved into the compiler suite in a new `jdk.graal.compiler.libgraal` module
88
which has no dependency on Native Image internals. This
99
is required for Galahad CE where libgraal must be buildable from the Graal compiler sources in the OpenJDK

compiler/mx.compiler/suite.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@
484484
"javaCompliance" : "21+",
485485
"dependencies" : [
486486
"GRAAL",
487-
"sdk:GRAAL_NATIVEIMAGE",
487+
"sdk:NATIVEIMAGE_LIBGRAAL",
488488
"sdk:JNIUTILS",
489489
"sdk:NATIVEBRIDGE"
490490
],
@@ -512,7 +512,7 @@
512512
"workingSets" : "Graal",
513513
"javaCompliance" : "21+",
514514
"dependencies" : [
515-
"sdk:GRAAL_NATIVEIMAGE",
515+
"sdk:NATIVEIMAGE_LIBGRAAL",
516516
],
517517
"requiresConcealed" : {
518518
"java.base" : [
@@ -676,7 +676,7 @@
676676
"jdk.graal.compiler.libgraal.loader"
677677
],
678678
"distDependencies" : [
679-
"sdk:GRAAL_NATIVEIMAGE",
679+
"sdk:NATIVEIMAGE_LIBGRAAL",
680680
"GRAAL",
681681
],
682682
"maven": False,
@@ -694,7 +694,7 @@
694694
],
695695
"distDependencies": [
696696
"GRAAL",
697-
"sdk:GRAAL_NATIVEIMAGE",
697+
"sdk:NATIVEIMAGE_LIBGRAAL",
698698
"sdk:JNIUTILS",
699699
"sdk:NATIVEIMAGE",
700700
"sdk:NATIVEBRIDGE"

compiler/src/jdk.graal.compiler.libgraal.loader/src/jdk/graal/compiler/libgraal/loader/HostedLibGraalClassLoader.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@
2424
*/
2525
package jdk.graal.compiler.libgraal.loader;
2626

27-
import jdk.graal.nativeimage.LibGraalLoader;
28-
import jdk.internal.jimage.BasicImageReader;
29-
import jdk.internal.module.ModulePath;
30-
import jdk.internal.module.Modules;
31-
import org.graalvm.nativeimage.Platform;
32-
import org.graalvm.nativeimage.Platforms;
33-
3427
import java.io.ByteArrayInputStream;
3528
import java.io.File;
3629
import java.io.IOException;
@@ -59,6 +52,14 @@
5952
import java.util.Set;
6053
import java.util.stream.Stream;
6154

55+
import org.graalvm.nativeimage.Platform;
56+
import org.graalvm.nativeimage.Platforms;
57+
import org.graalvm.nativeimage.libgraal.LibGraalLoader;
58+
59+
import jdk.internal.jimage.BasicImageReader;
60+
import jdk.internal.module.ModulePath;
61+
import jdk.internal.module.Modules;
62+
6263
/**
6364
* A classloader that reads class files and resources from a jimage file and a module path at image
6465
* build time. The {@code java.home} of the JDK containing the jimage can be obtained by converting

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/LibGraalClassLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
/**
3030
* The image runtime class loader that {@linkplain DuringSetupAccess#registerObjectReplacer
31-
* replaces} the build-time instance of the {@link jdk.graal.nativeimage.LibGraalLoader}.
31+
* replaces} the build-time instance of the {@link org.graalvm.nativeimage.libgraal.LibGraalLoader}.
3232
*/
3333
final class LibGraalClassLoader extends ClassLoader {
3434

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/LibGraalFeature.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,6 @@
4141
import java.util.function.BooleanSupplier;
4242
import java.util.function.Consumer;
4343

44-
import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
45-
import jdk.graal.compiler.graph.NodeClass;
46-
import jdk.graal.compiler.hotspot.EncodedSnippets;
47-
import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage;
48-
import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl;
49-
import jdk.graal.compiler.libgraal.truffle.LibGraalTruffleHostEnvironmentLookup;
50-
import jdk.graal.compiler.options.OptionsParser;
51-
import jdk.graal.compiler.serviceprovider.GraalServices;
52-
import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
53-
import jdk.graal.compiler.util.ObjectCopier;
54-
import jdk.internal.module.Modules;
55-
import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
56-
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
57-
import jdk.vm.ci.services.JVMCIServiceLocator;
5844
import org.graalvm.collections.EconomicMap;
5945
import org.graalvm.jniutils.NativeBridgeSupport;
6046
import org.graalvm.nativeimage.ImageSingletons;
@@ -64,14 +50,28 @@
6450
import org.graalvm.nativeimage.hosted.FieldValueTransformer;
6551
import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
6652
import org.graalvm.nativeimage.hosted.RuntimeReflection;
53+
import org.graalvm.nativeimage.libgraal.LibGraalLoader;
6754

6855
import jdk.graal.compiler.core.common.Fields;
56+
import jdk.graal.compiler.core.common.spi.ForeignCallSignature;
6957
import jdk.graal.compiler.debug.GraalError;
7058
import jdk.graal.compiler.graph.Edges;
59+
import jdk.graal.compiler.graph.NodeClass;
60+
import jdk.graal.compiler.hotspot.EncodedSnippets;
61+
import jdk.graal.compiler.hotspot.HotSpotForeignCallLinkage;
62+
import jdk.graal.compiler.hotspot.HotSpotReplacementsImpl;
63+
import jdk.graal.compiler.libgraal.truffle.LibGraalTruffleHostEnvironmentLookup;
7164
import jdk.graal.compiler.options.OptionDescriptor;
7265
import jdk.graal.compiler.options.OptionKey;
73-
import jdk.graal.nativeimage.LibGraalLoader;
66+
import jdk.graal.compiler.options.OptionsParser;
67+
import jdk.graal.compiler.serviceprovider.GraalServices;
68+
import jdk.graal.compiler.truffle.host.TruffleHostEnvironment;
69+
import jdk.graal.compiler.util.ObjectCopier;
70+
import jdk.internal.module.Modules;
71+
import jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
72+
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
7473
import jdk.vm.ci.hotspot.HotSpotModifiers;
74+
import jdk.vm.ci.services.JVMCIServiceLocator;
7575

7676
/**
7777
* This feature builds the libgraal shared library (e.g., libjvmcicompiler.so on linux).

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/LibGraalSupportImpl.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,6 @@
3434
import java.util.Map;
3535
import java.util.function.Supplier;
3636

37-
import jdk.graal.compiler.core.common.LibGraalSupport;
38-
import jdk.graal.compiler.debug.GraalError;
39-
import jdk.graal.compiler.libgraal.truffle.HSTruffleCompilerRuntime;
40-
import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
41-
import jdk.graal.compiler.word.Word;
42-
import jdk.graal.nativeimage.LibGraalLoader;
43-
import jdk.graal.nativeimage.LibGraalRuntime;
44-
import jdk.graal.nativeimage.hosted.GlobalData;
45-
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
46-
import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
47-
import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
48-
4937
import jdk.graal.compiler.options.OptionValues;
5038
import org.graalvm.collections.EconomicMap;
5139
import org.graalvm.collections.EconomicSet;
@@ -60,6 +48,18 @@
6048
import org.graalvm.nativeimage.RuntimeOptions;
6149
import org.graalvm.nativeimage.StackValue;
6250
import org.graalvm.nativeimage.VMRuntime;
51+
import org.graalvm.nativeimage.libgraal.LibGraalLoader;
52+
import org.graalvm.nativeimage.libgraal.LibGraalRuntime;
53+
import org.graalvm.nativeimage.libgraal.hosted.GlobalData;
54+
55+
import jdk.graal.compiler.core.common.LibGraalSupport;
56+
import jdk.graal.compiler.debug.GraalError;
57+
import jdk.graal.compiler.libgraal.truffle.HSTruffleCompilerRuntime;
58+
import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
59+
import jdk.graal.compiler.word.Word;
60+
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
61+
import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
62+
import jdk.vm.ci.hotspot.HotSpotVMConfigStore;
6363

6464
/**
6565
* Implementation of {@link LibGraalSupport} that is only loaded by the libgraal class loader when

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/truffle/LibGraalTruffleEntryPoints.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
import jdk.graal.compiler.truffle.TruffleCompilerOptions;
6262
import jdk.graal.compiler.truffle.hotspot.HotSpotTruffleCompilationSupport;
6363
import jdk.graal.compiler.truffle.hotspot.HotSpotTruffleCompilerImpl;
64-
import jdk.graal.nativeimage.LibGraalRuntime;
64+
import org.graalvm.nativeimage.libgraal.LibGraalRuntime;
6565
import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime;
6666
import jdk.vm.ci.hotspot.HotSpotVMConfigAccess;
6767
import jdk.vm.ci.meta.ResolvedJavaMethod;

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/core/common/LibGraalSupport.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
/**
4040
* Service provider interface (SPI) defining support needed by libgraal. Using an SPI instead of
41-
* directly depending on modules such as {@code jdk.graal.nativeimage} and
41+
* directly depending on modules such as {@code org.graalvm.nativeimage.libgraal} and
4242
* {@code org.graalvm.jniutils} allows use of jargraal (e.g., putting {@code compiler.jar} on the
4343
* {@code --upgrade-module-path} for use with Truffle on a non-GraalVM JDK) without concern for
4444
* dependencies that are only needed when building libgraal.

sdk/mx.sdk/mx_sdk.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def upx(args):
158158
third_party_license_files=[],
159159
dependencies=['sdkc'],
160160
jar_distributions=[],
161-
boot_jars=['sdk:NATIVEIMAGE', 'sdk:GRAAL_NATIVEIMAGE'],
161+
boot_jars=['sdk:NATIVEIMAGE', 'sdk:NATIVEIMAGE_LIBGRAAL'],
162162
stability="supported",
163163
)
164164
mx_sdk_vm.register_graalvm_component(graalvm_sdk_native_image_component)

sdk/mx.sdk/suite.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@
438438
},
439439

440440
# Native Image API extensions for libgraal.
441-
"jdk.graal.nativeimage" : {
441+
"org.graalvm.nativeimage.libgraal" : {
442442
"subDir" : "src",
443443
"sourceDirs" : ["src"],
444444
"dependencies" : [
@@ -841,22 +841,22 @@ class UniversalDetector {
841841
},
842842
},
843843

844-
"GRAAL_NATIVEIMAGE" : {
844+
"NATIVEIMAGE_LIBGRAAL" : {
845845
"subDir" : "src",
846846
"dependencies" : [
847-
"jdk.graal.nativeimage",
847+
"org.graalvm.nativeimage.libgraal",
848848
],
849849
"distDependencies" : ["NATIVEIMAGE"],
850850
"javadocType": "api",
851851
"moduleInfo" : {
852-
"name" : "jdk.graal.nativeimage",
852+
"name" : "org.graalvm.nativeimage.libgraal",
853853
"requires" : [
854854
"transitive org.graalvm.nativeimage",
855855
],
856856
"exports" : [
857-
"jdk.graal.nativeimage",
858-
"jdk.graal.nativeimage.hosted",
859-
"jdk.graal.nativeimage.impl to org.graalvm.nativeimage.builder",
857+
"org.graalvm.nativeimage.libgraal",
858+
"org.graalvm.nativeimage.libgraal.hosted",
859+
"org.graalvm.nativeimage.libgraal.impl to org.graalvm.nativeimage.builder",
860860
],
861861
"uses" : [],
862862
"opens" : [],

sdk/src/jdk.graal.nativeimage/snapshot.sigtest renamed to sdk/src/org.graalvm.nativeimage.libgraal/snapshot.sigtest

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#Signature file v4.1
22
#Version
33

4-
CLSS public abstract interface jdk.graal.nativeimage.LibGraalLoader
4+
CLSS public abstract interface org.graalvm.nativeimage.libgraal.LibGraalLoader
55
meth public abstract java.util.Map getClassModuleMap()
66

7-
CLSS public final jdk.graal.nativeimage.LibGraalRuntime
7+
CLSS public final org.graalvm.nativeimage.libgraal.LibGraalRuntime
88
meth public static long getIsolateID()
99
meth public static void notifyLowMemoryPoint(boolean)
1010
meth public static void processReferences()
1111
meth public static void fatalError(java.lang.String)
1212
supr java.lang.Object
1313

14-
CLSS public final jdk.graal.nativeimage.hosted.GlobalData
14+
CLSS public final org.graalvm.nativeimage.libgraal.hosted.GlobalData
1515
meth public static java.util.function.Supplier<java.lang.Long> createGlobal(long)
1616
supr java.lang.Object
1717

sdk/src/jdk.graal.nativeimage/src/jdk/graal/nativeimage/LibGraalLoader.java renamed to sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/LibGraalLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package jdk.graal.nativeimage;
41+
package org.graalvm.nativeimage.libgraal;
4242

4343
import java.util.Map;
4444

sdk/src/jdk.graal.nativeimage/src/jdk/graal/nativeimage/LibGraalRuntime.java renamed to sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/LibGraalRuntime.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package jdk.graal.nativeimage;
41+
package org.graalvm.nativeimage.libgraal;
4242

4343
import java.lang.ref.Reference;
4444
import java.lang.ref.ReferenceQueue;
4545

4646
import org.graalvm.nativeimage.ImageSingletons;
4747

48-
import jdk.graal.nativeimage.impl.LibGraalRuntimeSupport;
48+
import org.graalvm.nativeimage.libgraal.impl.LibGraalRuntimeSupport;
4949

5050
/**
5151
* LibGraal specific extensions to {@link org.graalvm.nativeimage}.

sdk/src/jdk.graal.nativeimage/src/jdk/graal/nativeimage/hosted/GlobalData.java renamed to sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/hosted/GlobalData.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package jdk.graal.nativeimage.hosted;
41+
package org.graalvm.nativeimage.libgraal.hosted;
4242

43-
import jdk.graal.nativeimage.impl.GlobalDataSupport;
43+
import org.graalvm.nativeimage.libgraal.impl.GlobalDataSupport;
4444
import org.graalvm.nativeimage.ImageSingletons;
4545
import org.graalvm.nativeimage.Platform;
4646
import org.graalvm.nativeimage.Platforms;

sdk/src/jdk.graal.nativeimage/src/jdk/graal/nativeimage/package-info.java renamed to sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/hosted/package-info.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
)
4545
*/
4646
/**
47-
* Extensions to the GraalVM SDK Native Image API to customize building libgraal.
47+
* Extensions to the GraalVM SDK Native Image API to customize building libgraal. Although these
48+
* extensions contain public classes, they should only be used by the feature that builds libgraal.
4849
*
4950
* @since 25
5051
*/
51-
package jdk.graal.nativeimage;
52+
package org.graalvm.nativeimage.libgraal.hosted;

sdk/src/jdk.graal.nativeimage/src/jdk/graal/nativeimage/impl/GlobalDataSupport.java renamed to sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/impl/GlobalDataSupport.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package jdk.graal.nativeimage.impl;
41+
package org.graalvm.nativeimage.libgraal.impl;
4242

43-
import jdk.graal.nativeimage.hosted.GlobalData;
43+
import org.graalvm.nativeimage.libgraal.hosted.GlobalData;
4444

4545
import java.util.function.Supplier;
4646

4747
/**
48-
* Service provider interface for implementation of {@link GlobalData}.
48+
* Interface for Native Image to implement {@link GlobalData}.
4949
*/
5050
public interface GlobalDataSupport {
5151

sdk/src/jdk.graal.nativeimage/src/jdk/graal/nativeimage/impl/LibGraalRuntimeSupport.java renamed to sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/impl/LibGraalRuntimeSupport.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3939
* SOFTWARE.
4040
*/
41-
package jdk.graal.nativeimage.impl;
41+
package org.graalvm.nativeimage.libgraal.impl;
4242

43-
import jdk.graal.nativeimage.LibGraalRuntime;
43+
import org.graalvm.nativeimage.libgraal.LibGraalRuntime;
4444

4545
/**
46-
* Service provider interface for implementation of {@link LibGraalRuntime}.
46+
* Interface for Native Image to implement {@link LibGraalRuntime}.
4747
*/
4848
public interface LibGraalRuntimeSupport {
4949

sdk/src/jdk.graal.nativeimage/src/jdk/graal/nativeimage/hosted/package-info.java renamed to sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/package-info.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
)
4545
*/
4646
/**
47-
* Extensions to the GraalVM SDK Native Image API to customize building libgraal.
47+
* Extensions to the GraalVM SDK Native Image API to customize building libgraal. Although these
48+
* extensions contain public classes, they should only be used by the feature that builds libgraal.
4849
*
4950
* @since 25
5051
*/
51-
package jdk.graal.nativeimage.hosted;
52+
package org.graalvm.nativeimage.libgraal;

substratevm/mx.substratevm/suite.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
"sourceDirs": ["src"],
220220
"dependencies": [
221221
"sdk:NATIVEIMAGE",
222-
"sdk:GRAAL_NATIVEIMAGE",
222+
"sdk:NATIVEIMAGE_LIBGRAAL",
223223
"compiler:GRAAL",
224224
],
225225
"requiresConcealed" : {
@@ -1714,7 +1714,7 @@
17141714
"transitive org.graalvm.nativeimage.pointsto",
17151715
"org.graalvm.collections",
17161716
"org.graalvm.truffle.compiler",
1717-
"jdk.graal.nativeimage"
1717+
"org.graalvm.nativeimage.libgraal"
17181718
],
17191719
"uses" : [
17201720
"org.graalvm.nativeimage.Platform",
@@ -2144,7 +2144,7 @@
21442144
"distDependencies": [
21452145
"compiler:GRAAL",
21462146
"sdk:NATIVEIMAGE",
2147-
"sdk:GRAAL_NATIVEIMAGE",
2147+
"sdk:NATIVEIMAGE_LIBGRAAL",
21482148
],
21492149
"exclude": [
21502150
],

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/GlobalLongSupplier.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
package com.oracle.svm.core.c;
2626

2727
import jdk.graal.compiler.word.Word;
28-
import jdk.graal.nativeimage.hosted.GlobalData;
28+
import org.graalvm.nativeimage.libgraal.hosted.GlobalData;
2929
import org.graalvm.word.PointerBase;
3030

3131
import java.util.function.Supplier;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/libgraal/LibGraalRuntimeSupportImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.oracle.svm.core.heap.Heap;
3232
import com.oracle.svm.core.util.VMError;
3333

34-
import jdk.graal.nativeimage.impl.LibGraalRuntimeSupport;
34+
import org.graalvm.nativeimage.libgraal.impl.LibGraalRuntimeSupport;
3535

3636
@AutomaticallyRegisteredImageSingleton({LibGraalRuntimeSupport.class})
3737
public final class LibGraalRuntimeSupportImpl implements LibGraalRuntimeSupport {

0 commit comments

Comments
 (0)