[GR-65404] Remove PolyglotLauncher

Author: eregon

sdk/mx.sdk/mx_sdk_vm.py

@@ -82,14 +82,13 @@
 
 
 class AbstractNativeImageConfig(object, metaclass=ABCMeta):
-    def __init__(self, destination, jar_distributions, build_args, use_modules=None, links=None, is_polyglot=False, dir_jars=False, home_finder=False, build_time=1, build_args_enterprise=None):  # pylint: disable=super-init-not-called
+    def __init__(self, destination, jar_distributions, build_args, use_modules=None, links=None, dir_jars=False, home_finder=False, build_time=1, build_args_enterprise=None):  # pylint: disable=super-init-not-called
         """
         :type destination: str
         :type jar_distributions: list[str]
         :type build_args: list[str]
         :param str | None use_modules: Run (with 'launcher') or run and build image with module support (with 'image').
         :type links: list[str] | None
-        :type is_polyglot: bool
         :param bool dir_jars: If true, all jars in the component directory are added to the classpath.
         :type home_finder: bool
         :type build_time: int
@@ -100,7 +99,6 @@ def __init__(self, destination, jar_distributions, build_args, use_modules=None,
         self.build_args = build_args
         self.use_modules = use_modules
         self.links = [mx_subst.path_substitutions.substitute(link) for link in links] if links else []
-        self.is_polyglot = is_polyglot
         self.dir_jars = dir_jars
         self.home_finder = home_finder
         self.build_time = build_time
@@ -184,7 +182,7 @@ def __init__(self, destination, jar_distributions, main_class, build_args, langu
         :param str language
         """
         super(LanguageLauncherConfig, self).__init__(destination, jar_distributions, main_class, build_args,
-                                                     is_sdk_launcher=is_sdk_launcher, is_polyglot=False, **kwargs)
+                                                     is_sdk_launcher=is_sdk_launcher, **kwargs)
         self.language = language
 
         # Ensure the language launcher can always find the language home

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -2015,7 +2015,7 @@ def _get_main_module():
         def _get_extra_jvm_args():
             image_config = self.subject.native_image_config
             extra_jvm_args = mx.list_to_cmd_line(image_config.extra_jvm_args)
-            if isinstance(self.subject.component, mx_sdk.GraalVmTruffleComponent) or image_config.is_polyglot:
+            if isinstance(self.subject.component, mx_sdk.GraalVmTruffleComponent):
                 extra_jvm_args = ' '.join([extra_jvm_args, '--enable-native-access=org.graalvm.truffle'])
                 # GR-59703: Migrate sun.misc.* usages.
                 if mx.VersionSpec("23.0.0") <= mx.get_jdk(tag='default').version:
@@ -2194,8 +2194,6 @@ def get_build_args(self):
         ] + svm_experimental_options(experimental_build_args) + [
             '--macro:' + GraalVmNativeProperties.macro_name(self.subject.native_image_config), # last to allow overrides
         ]
-        if self.subject.native_image_config.is_polyglot:
-            build_args += ["--macro:truffle", "--language:all"]
         return build_args
 
 

sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java

@@ -280,7 +280,7 @@ final void launch(List<String> args, Map<String, String> defaultOptions, boolean
 
         if (isAOT() && doNativeSetup && !IS_LIBPOLYGLOT) {
             assert nativeAccess != null;
-            maybeExec(originalArgs, unrecognizedArgs, false, getDefaultVMType(), jniLaunch);
+            maybeExec(originalArgs, unrecognizedArgs, getDefaultVMType(), jniLaunch);
         }
 
         parseUnrecognizedOptions(getLanguageId(), polyglotOptions, unrecognizedArgs);

sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/LanguageLauncherBase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -171,10 +171,6 @@ final boolean isPolyglot() {
         return seenPolyglot;
     }
 
-    final void setPolyglot(boolean polyglot) {
-        seenPolyglot = polyglot;
-    }
-
     final void setupContextBuilder(Context.Builder builder) {
         Path logFile = getLogFile();
         if (logFile != null) {

sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -1215,14 +1215,14 @@ protected static String getProgramName() {
     @SuppressWarnings("unused")
     @Deprecated(since = "20.3")
     protected final void maybeNativeExec(List<String> args, boolean isPolyglotLauncher, Map<String, String> polyglotOptions) {
-        maybeNativeExec(args, args, isPolyglotLauncher);
+        maybeNativeExec(args, args, false);
     }
 
     /**
      * Possibly re-executes the launcher when JVM or polyglot mode is requested; call only if
      * {@link #isAOT()} is true. If the result is to run native, then it applies VM options on the
      * current process.
-     *
+     * <p>
      * The method parses the {@code unrecognizedArgs} for --jvm/--native/--polyglot flags and --vm.*
      * options. If JVM mode is requested, it execs a Java process configured with supported JVM
      * parameters and system properties over this process - in this case, the method does not return
@@ -1232,17 +1232,17 @@ protected final void maybeNativeExec(List<String> args, boolean isPolyglotLaunch
      * @param unrecognizedArgs a subset of {@code originalArgs} that was not recognized by
      *            {@link AbstractLanguageLauncher#preprocessArguments(List, Map)}. All arguments
      *            recognized by maybeExec are removed from the list.
-     * @param isPolyglotLauncher whether this is the {@link PolyglotLauncher} (bin/polyglot)
+     * @param isPolyglotLauncher no longer used, always false
      * @since 20.0
      */
-    protected final void maybeNativeExec(List<String> originalArgs, List<String> unrecognizedArgs, boolean isPolyglotLauncher) {
+    protected final void maybeNativeExec(List<String> originalArgs, List<String> unrecognizedArgs, @SuppressWarnings("unused") boolean isPolyglotLauncher) {
         if (!IS_AOT) {
             return;
         }
-        maybeExec(originalArgs, unrecognizedArgs, isPolyglotLauncher, getDefaultVMType(), false);
+        maybeExec(originalArgs, unrecognizedArgs, getDefaultVMType(), false);
     }
 
-    void maybeExec(List<String> originalArgs, List<String> unrecognizedArgs, boolean isPolyglotLauncher, VMType defaultVmType, boolean thinLauncher) {
+    void maybeExec(List<String> originalArgs, List<String> unrecognizedArgs, VMType defaultVmType, boolean thinLauncher) {
         assert isAOT();
         VMType vmType = null;
         boolean polyglot = false;
@@ -1299,7 +1299,7 @@ void maybeExec(List<String> originalArgs, List<String> unrecognizedArgs, boolean
                 jvmArgs.add('-' + vmOption);
             }
 
-            if (!isPolyglotLauncher && polyglot) {
+            if (polyglot) {
                 applicationArgs.add(0, "--polyglot");
             }
             assert !isStandalone();
@@ -1329,7 +1329,7 @@ void maybeExec(List<String> originalArgs, List<String> unrecognizedArgs, boolean
              */
             VMRuntime.initialize();
 
-            if (!isPolyglotLauncher && polyglot) {
+            if (polyglot) {
                 assert jvmArgs.isEmpty();
                 if (isStandalone()) {
                     throw abort("--polyglot option is only supported when this launcher is part of a GraalVM.");