From d44062397b1f9de05f98fc9ec1f270b111c4bab6 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Wed, 6 Aug 2025 15:51:47 +0200
Subject: [PATCH 1/5] [GR-65404] Remove PolyglotLauncher

---
 sdk/mx.sdk/mx_sdk_vm.py                       |   6 +-
 sdk/mx.sdk/mx_sdk_vm_impl.py                  |   4 +-
 .../launcher/AbstractLanguageLauncher.java    |   2 +-
 .../launcher/LanguageLauncherBase.java        |   6 +-
 .../src/org/graalvm/launcher/Launcher.java    |  18 +-
 .../graalvm/launcher/PolyglotLauncher.java    | 573 ------------------
 .../launcher/PolyglotLauncherFeature.java     |  60 --
 7 files changed, 14 insertions(+), 655 deletions(-)
 delete mode 100644 sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncher.java
 delete mode 100644 sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncherFeature.java

diff --git a/sdk/mx.sdk/mx_sdk_vm.py b/sdk/mx.sdk/mx_sdk_vm.py
index b1081b03afef..1531e89c5853 100644
--- a/sdk/mx.sdk/mx_sdk_vm.py
+++ b/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
diff --git a/sdk/mx.sdk/mx_sdk_vm_impl.py b/sdk/mx.sdk/mx_sdk_vm_impl.py
index 176ac9b4140b..239ff60eb044 100644
--- a/sdk/mx.sdk/mx_sdk_vm_impl.py
+++ b/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
 
 
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
index 23038a2f67a9..4273fa96d885 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
+++ b/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);
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/LanguageLauncherBase.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/LanguageLauncherBase.java
index 56852442c8f9..b2237b83f14d 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/LanguageLauncherBase.java
+++ b/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) {
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
index 6ac8b9d9d4cc..c1011a77cff3 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
+++ b/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.");
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncher.java
deleted file mode 100644
index bce558bcdeba..000000000000
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncher.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * Copyright (c) 2017, 2022, 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
- *
- * Subject to the condition set forth below, permission is hereby granted to any
- * person obtaining a copy of this software, associated documentation and/or
- * data (collectively the "Software"), free of charge and under any and all
- * copyright rights in the Software, and any and all patent rights owned or
- * freely licensable by each licensor hereunder covering either (i) the
- * unmodified Software as contributed to or provided by such licensor, or (ii)
- * the Larger Works (as defined below), to deal in both
- *
- * (a) the Software, and
- *
- * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
- * one is included with the Software each a "Larger Work" to which the Software
- * is contributed by such licensors),
- *
- * without restriction, including without limitation the rights to copy, create
- * derivative works of, display, perform, and distribute the Software and make,
- * use, sell, offer for sale, import, export, have made, and have sold the
- * Software and the Larger Work(s), and to sublicense the foregoing rights on
- * either these or other terms.
- *
- * This license is subject to the following condition:
- *
- * The above copyright notice and either this complete permission notice or at a
- * minimum a reference to the UPL must be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package org.graalvm.launcher;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.graalvm.home.HomeFinder;
-import org.graalvm.options.OptionCategory;
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Engine;
-import org.graalvm.polyglot.Language;
-import org.graalvm.polyglot.PolyglotException;
-import org.graalvm.polyglot.PolyglotException.StackFrame;
-import org.graalvm.polyglot.Source;
-import org.graalvm.polyglot.Value;
-
-public final class PolyglotLauncher extends LanguageLauncherBase {
-
-    private String mainLanguage = null;
-    private boolean verbose = false;
-    private boolean version = false;
-    private boolean shell = false;
-
-    @Override
-    protected void printHelp(OptionCategory maxCategory) {
-        Engine engine = getTempEngine();
-        // @formatter:off
-        printVersion(engine);
-        System.out.println();
-        System.out.println("Usage: polyglot [OPTION]... [FILE] [ARGS]...");
-        List<Language> languages = sortedLanguages(engine);
-        System.out.print("Available languages: ");
-        String sep = "";
-        for (Language language : languages) {
-            System.out.print(sep);
-            System.out.print(language.getId());
-            sep = ", ";
-        }
-        System.out.println();
-        System.out.println("Basic Options:");
-        launcherOption("--language <lang>",      "Specifies the main language.");
-        launcherOption("--file [<lang>:]FILE",   "Additional file to execute.");
-        launcherOption("--eval [<lang>:]CODE",   "Evaluates code snippets, for example, '--eval js:42'.");
-        launcherOption("--shell",                "Start a multi language shell.");
-        launcherOption("--verbose",              "Enable verbose stack trace for internal errors.");
-        // @formatter:on
-    }
-
-    @Override
-    protected void collectArguments(Set<String> args) {
-        args.addAll(Arrays.asList(
-                        "--language",
-                        "--file [<lang>:]FILE",
-                        "--eval [<lang>:]CODE",
-                        "--shell"));
-        super.collectArguments(args);
-    }
-
-    @Override
-    protected void printVersion() {
-        printVersion(getTempEngine());
-        printPolyglotVersions();
-    }
-
-    protected void printVersion(Engine engine) {
-        String engineImplementationName = engine.getImplementationName();
-        if (isAOT()) {
-            engineImplementationName += " Native";
-        }
-        println(String.format("%s polyglot launcher %s", engineImplementationName, engine.getVersion()));
-    }
-
-    /**
-     * Parse arguments when running the bin/polyglot launcher directly.
-     */
-    private List<String> parsePolyglotLauncherOptions(Deque<String> arguments, List<Script> scripts) {
-        List<String> unrecognizedArgs = new ArrayList<>();
-
-        while (!arguments.isEmpty()) {
-            String arg = arguments.removeFirst();
-
-            if (arg.equals("--eval") || arg.equals("--file")) {
-                String value = getNextArgument(arguments, arg);
-                int index = value.indexOf(":");
-                String languageId = null;
-                String script;
-                if (index != -1) {
-                    languageId = value.substring(0, index);
-                    script = value.substring(index + 1);
-                } else {
-                    script = value;
-                }
-                if (arg.equals("--eval")) {
-                    scripts.add(new EvalScript(languageId, script));
-                } else {
-                    scripts.add(new FileScript(languageId, script, false));
-                }
-            } else if (arg.equals("--")) {
-                break;
-            } else if (!arg.startsWith("-")) {
-                scripts.add(new FileScript(mainLanguage, arg, true));
-                break;
-            } else if (arg.equals("--version")) {
-                version = true;
-            } else if (arg.equals("--shell")) {
-                shell = true;
-            } else if (arg.equals("--verbose")) {
-                verbose = true;
-            } else if (arg.equals("--language")) {
-                mainLanguage = getNextArgument(arguments, arg);
-            } else {
-                unrecognizedArgs.add(arg);
-            }
-        }
-
-        return unrecognizedArgs;
-    }
-
-    private String getNextArgument(Deque<String> arguments, String option) {
-        if (arguments.isEmpty()) {
-            throw abort(option + " expects an argument");
-        }
-        return arguments.removeFirst();
-    }
-
-    private void launch(String[] args) {
-        List<String> argumentsList = new ArrayList<>(Arrays.asList(args));
-        for (;;) {
-            try {
-                launchImpl(argumentsList);
-            } catch (RestartInJVMException ex) {
-                argumentsList.add(0, "--jvm");
-                continue;
-            }
-            return;
-        }
-    }
-
-    private void launchImpl(List<String> argumentsList) {
-        if (isAOT()) {
-            List<String> originalArgs = Collections.unmodifiableList(new ArrayList<>(argumentsList));
-            maybeNativeExec(originalArgs, argumentsList, true);
-        }
-
-        final Deque<String> arguments = new ArrayDeque<>(argumentsList);
-        if (!arguments.isEmpty() && arguments.getFirst().equals("--use-launcher")) {
-            // We are called from another launcher which used --polyglot
-            arguments.removeFirst();
-            String launcherName = getNextArgument(arguments, "--use-launcher");
-            switchToLauncher(launcherName, new HashMap<>(), new ArrayList<>(arguments));
-            return;
-        }
-
-        List<Script> scripts = new ArrayList<>();
-        List<String> unrecognizedArgs = parsePolyglotLauncherOptions(arguments, scripts);
-
-        Map<String, String> polyglotOptions = new HashMap<>();
-        parseUnrecognizedOptions(null, polyglotOptions, unrecognizedArgs);
-
-        String[] programArgs = arguments.toArray(new String[0]);
-
-        if (runLauncherAction()) {
-            return;
-        }
-        argumentsProcessingDone();
-
-        final Context.Builder contextBuilder = Context.newBuilder().options(polyglotOptions);
-
-        contextBuilder.allowAllAccess(true);
-        setupContextBuilder(contextBuilder);
-
-        if (version) {
-            printVersion(Engine.newBuilder().options(polyglotOptions).build());
-            throw exit();
-        }
-
-        if (shell) {
-            runShell(contextBuilder);
-        } else if (scripts.size() == 0) {
-            throw abort("No files specified. Use --help for usage instructions.");
-        } else {
-            runScripts(scripts, contextBuilder, programArgs);
-        }
-    }
-
-    static final Map<String, Class<AbstractLanguageLauncher>> AOT_LAUNCHER_CLASSES;
-
-    static {
-        if (IS_AOT) {
-            AOT_LAUNCHER_CLASSES = new HashMap<>();
-            List<URL> classpath = new ArrayList<>();
-            List<String> classes = new ArrayList<>();
-            HomeFinder.getInstance().getLanguageHomes().values().stream().flatMap(PolyglotLauncher::loadPolyglotConfig).forEach(c -> {
-                c.classpath.stream().map(c.dir::resolve).map(p -> {
-                    if (!Files.exists(p)) {
-                        throw new RuntimeException(p + " does not exist");
-                    }
-                    try {
-                        return p.normalize().toUri().toURL();
-                    } catch (MalformedURLException e) {
-                        throw new RuntimeException(e);
-                    }
-                }).forEach(classpath::add);
-                classes.add(c.launcher);
-            });
-            URLClassLoader loader = new URLClassLoader(classpath.toArray(new URL[0]), PolyglotLauncher.class.getClassLoader());
-            for (String launcher : classes) {
-                AOT_LAUNCHER_CLASSES.put(launcher, getLauncherClass(launcher, loader));
-            }
-        } else {
-            AOT_LAUNCHER_CLASSES = null;
-        }
-    }
-
-    private static Stream<PolyglotLauncherConfig> loadPolyglotConfig(Path p) {
-        Path configPath = p.resolve("polyglot.config");
-        if (!Files.exists(configPath)) {
-            return null;
-        }
-        try {
-            return Files.lines(configPath, StandardCharsets.UTF_8).map(String::trim).filter(s -> !s.isEmpty()).map(l -> PolyglotLauncherConfig.parse(l, configPath));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static final class PolyglotLauncherConfig {
-        final Path dir;
-        final List<String> classpath;
-        final String launcher;
-
-        static PolyglotLauncherConfig parse(String spec, Path context) {
-            String[] parts = spec.split("\\|");
-            if (parts.length != 2) {
-                throw new RuntimeException("Expected 2 `|`-separated parts in polyglot config (" + context + "). Got: " + Arrays.toString(parts));
-            }
-            return new PolyglotLauncherConfig(context.getParent(), Arrays.asList(parts[0].split(":")), parts[1]);
-        }
-
-        PolyglotLauncherConfig(Path dir, List<String> classpath, String launcher) {
-            this.dir = dir;
-            this.classpath = classpath;
-            this.launcher = launcher;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static Class<AbstractLanguageLauncher> getLauncherClass(String launcherName, ClassLoader loader) {
-        try {
-            Class<?> launcherClass = Class.forName(launcherName, false, loader);
-            if (!AbstractLanguageLauncher.class.isAssignableFrom(launcherClass)) {
-                throw new RuntimeException("Launcher class " + launcherName + " does not extend AbstractLanguageLauncher");
-            }
-            return (Class<AbstractLanguageLauncher>) launcherClass;
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException("Launcher class " + launcherName + " does not exist", e);
-        }
-    }
-
-    private void switchToLauncher(String launcherName, Map<String, String> options, List<String> args) {
-        Class<AbstractLanguageLauncher> launcherClass;
-        if (isAOT()) {
-            launcherClass = AOT_LAUNCHER_CLASSES.get(launcherName);
-            if (launcherClass == null) {
-                throw abort("Could not find class '" + launcherName +
-                                "'.\nYou might need to rebuild the polyglot launcher with 'gu rebuild-images polyglot'.\nThe following launchers are available:\n" +
-                                AOT_LAUNCHER_CLASSES.keySet().stream().sorted().map(s -> " - " + s).collect(Collectors.joining("\n")));
-            }
-        } else {
-            List<URL> classpath = new ArrayList<>();
-            HomeFinder.getInstance().getLanguageHomes().values().stream().flatMap(PolyglotLauncher::loadPolyglotConfig).filter(c -> launcherName.endsWith(c.launcher)).forEach(c -> {
-                c.classpath.stream().map(c.dir::resolve).map(p -> {
-                    if (!Files.exists(p)) {
-                        throw new RuntimeException(p + " does not exist");
-                    }
-                    try {
-                        return p.normalize().toUri().toURL();
-                    } catch (MalformedURLException e) {
-                        throw new RuntimeException(e);
-                    }
-                }).forEach(classpath::add);
-            });
-            URLClassLoader loader = new URLClassLoader(classpath.toArray(new URL[0]), PolyglotLauncher.class.getClassLoader());
-            launcherClass = getLauncherClass(launcherName, loader);
-        }
-        AbstractLanguageLauncher launcher;
-        try {
-            launcher = launcherClass.getDeclaredConstructor().newInstance();
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to instantiate launcher class " + launcherName, e);
-        }
-        launcher.setPolyglot(true);
-        launcher.launch(args, options, false);
-    }
-
-    private void checkLanguage(String language, Engine engine) {
-        if (language == null) {
-            return;
-        }
-        if (!engine.getLanguages().containsKey(language)) {
-            throw abort("Language '" + language + "' not found");
-        }
-    }
-
-    private void runScripts(List<Script> scripts, Context.Builder contextBuilder, String[] programArgs) {
-        Script mainScript = scripts.get(scripts.size() - 1);
-        try (Context context = contextBuilder.arguments(mainScript.getLanguage(), programArgs).build()) {
-            Engine engine = context.getEngine();
-            checkLanguage(mainLanguage, engine);
-            for (Script script : scripts) {
-                checkLanguage(script.languageId, engine);
-            }
-            for (Script script : scripts) {
-                try {
-                    Value result = context.eval(script.getSource());
-                    if (script.isPrintResult()) {
-                        System.out.println(result);
-                    }
-                } catch (PolyglotException e) {
-                    throw abort(e);
-                } catch (IOException e) {
-                    throw abort(e);
-                } catch (Throwable t) {
-                    throw abort(t);
-                }
-            }
-        }
-    }
-
-    AbortException abort(PolyglotException e) {
-        if (e.isInternalError()) {
-            System.err.println("Internal error occurred: " + e.toString());
-            if (verbose) {
-                e.printStackTrace(System.err);
-            } else {
-                System.err.println("Run with --verbose to see the full stack trace.");
-            }
-            throw exit(1);
-        } else if (e.isExit()) {
-            throw exit(e.getExitStatus());
-        } else if (e.isSyntaxError()) {
-            throw abort(e.getMessage(), 1);
-        } else {
-            List<StackFrame> trace = new ArrayList<>();
-            for (StackFrame stackFrame : e.getPolyglotStackTrace()) {
-                trace.add(stackFrame);
-            }
-            // remove trailing host frames
-            for (int i = trace.size() - 1; i >= 0; i--) {
-                if (trace.get(i).isHostFrame()) {
-                    trace.remove(i);
-                } else {
-                    break;
-                }
-            }
-            if (e.isHostException()) {
-                System.err.println(e.asHostException().toString());
-            } else {
-                System.err.println(e.getMessage());
-            }
-            for (StackFrame stackFrame : trace) {
-                System.err.print("        at ");
-                System.err.println(stackFrame.toString());
-            }
-            throw exit(1);
-        }
-    }
-
-    private void runShell(Context.Builder contextBuilder) {
-        try (Context context = contextBuilder.build();
-                        MultiLanguageShell polyglotShell = new MultiLanguageShell(context, mainLanguage, createSystemTerminal())) {
-            throw exit(polyglotShell.runRepl());
-        } catch (IOException e) {
-            throw abort(e);
-        }
-    }
-
-    public static void main(String[] args) {
-        PolyglotLauncher launcher = new PolyglotLauncher();
-        try {
-            try {
-                launcher.launch(args);
-            } catch (AbortException e) {
-                throw e;
-            } catch (PolyglotException e) {
-                launcher.handlePolyglotException(e);
-            } catch (Throwable t) {
-                throw launcher.abort(t);
-            }
-        } catch (AbortException e) {
-            launcher.handleAbortException(e);
-        }
-    }
-
-    private static final class RestartInJVMException extends RuntimeException {
-        static final long serialVersionUID = 1;
-
-        RestartInJVMException() {
-        }
-    }
-
-    private abstract class Script {
-        final String languageId;
-
-        Script(String languageId) {
-            this.languageId = languageId;
-        }
-
-        final String getLanguage() {
-            String language = languageId;
-            if (language == null) {
-                language = findLanguage();
-            }
-            if (language == null) {
-                if (mainLanguage != null) {
-                    return mainLanguage;
-                }
-            }
-            if (language == null) {
-                final String msg = "Cannot determine language for '%s' %s";
-                if (isAOT()) {
-                    getError().println(String.format(msg, this, "Trying with --jvm mode..."));
-                    throw new RestartInJVMException();
-                }
-                throw abort(String.format(msg, this, this.getLanguageSpecifierHelp()));
-            }
-            return language;
-        }
-
-        protected String findLanguage() {
-            return null;
-        }
-
-        public abstract boolean isPrintResult();
-
-        public abstract Source getSource() throws IOException;
-
-        protected abstract String getLanguageSpecifierHelp();
-    }
-
-    private class FileScript extends Script {
-        private final boolean main;
-        final String file;
-        private Source source;
-
-        FileScript(String languageId, String file, boolean main) {
-            super(languageId);
-            this.file = file;
-            this.main = main;
-        }
-
-        @Override
-        public Source getSource() throws IOException {
-            if (source == null) {
-                source = Source.newBuilder(getLanguage(), new File(file)).build();
-            }
-            return source;
-        }
-
-        @Override
-        protected String findLanguage() {
-            try {
-                return Source.findLanguage(new File(file));
-            } catch (IOException e) {
-                return null;
-            }
-        }
-
-        @Override
-        public String toString() {
-            return file;
-        }
-
-        @Override
-        protected String getLanguageSpecifierHelp() {
-            if (main) {
-                return "use the --language option";
-            } else {
-                return "specify the language using --file <language>:<file>. ";
-            }
-        }
-
-        @Override
-        public boolean isPrintResult() {
-            return false;
-        }
-    }
-
-    private class EvalScript extends Script {
-        final String script;
-
-        EvalScript(String languageId, String script) {
-            super(languageId);
-            this.script = script;
-        }
-
-        @Override
-        public Source getSource() {
-            return Source.create(getLanguage(), script);
-        }
-
-        @Override
-        public String toString() {
-            return script;
-        }
-
-        @Override
-        protected String getLanguageSpecifierHelp() {
-            return "specify the language using --eval <language>:<source>.";
-        }
-
-        @Override
-        public boolean isPrintResult() {
-            return true;
-        }
-    }
-}
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncherFeature.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncherFeature.java
deleted file mode 100644
index 71b21dc4a911..000000000000
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncherFeature.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017, 2022, 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
- *
- * Subject to the condition set forth below, permission is hereby granted to any
- * person obtaining a copy of this software, associated documentation and/or
- * data (collectively the "Software"), free of charge and under any and all
- * copyright rights in the Software, and any and all patent rights owned or
- * freely licensable by each licensor hereunder covering either (i) the
- * unmodified Software as contributed to or provided by such licensor, or (ii)
- * the Larger Works (as defined below), to deal in both
- *
- * (a) the Software, and
- *
- * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
- * one is included with the Software each a "Larger Work" to which the Software
- * is contributed by such licensors),
- *
- * without restriction, including without limitation the rights to copy, create
- * derivative works of, display, perform, and distribute the Software and make,
- * use, sell, offer for sale, import, export, have made, and have sold the
- * Software and the Larger Work(s), and to sublicense the foregoing rights on
- * either these or other terms.
- *
- * This license is subject to the following condition:
- *
- * The above copyright notice and either this complete permission notice or at a
- * minimum a reference to the UPL must be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package org.graalvm.launcher;
-
-import org.graalvm.nativeimage.hosted.Feature;
-import org.graalvm.nativeimage.hosted.RuntimeReflection;
-
-class PolyglotLauncherFeature implements Feature {
-
-    public String getURL() {
-        return "https://github.com/oracle/graal/blob/master/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/PolyglotLauncherFeature.java";
-    }
-
-    public String getDescription() {
-        return "Registers launchers for AOT compilation";
-    }
-
-    @Override
-    public void beforeAnalysis(BeforeAnalysisAccess access) {
-        PolyglotLauncher.AOT_LAUNCHER_CLASSES.values().forEach(RuntimeReflection::registerForReflectiveInstantiation);
-    }
-}

From 7e523bae02e3fc6955c6982de53c58b8a41aef27 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Wed, 6 Aug 2025 16:05:17 +0200
Subject: [PATCH 2/5] Simplify some parameters which are always the same

---
 .../graalvm/launcher/AbstractLanguageLauncher.java  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
index 4273fa96d885..7618bfa11bfc 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
+++ b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
@@ -122,7 +122,7 @@ private static Constructor<AbstractLanguageLauncher> getLauncherCtor() {
     protected final void launch(String[] args) {
         try {
             try {
-                launch(new ArrayList<>(Arrays.asList(args)), null, true);
+                launch(new ArrayList<>(Arrays.asList(args)));
             } catch (AbortException e) {
                 throw e;
             } catch (PolyglotException e) {
@@ -260,15 +260,12 @@ protected long getNativeArgv() {
 
     protected static final boolean IS_LIBPOLYGLOT = Boolean.getBoolean("graalvm.libpolyglot");
 
-    final void launch(List<String> args, Map<String, String> defaultOptions, boolean doNativeSetup) {
+    final void launch(List<String> args) {
         List<String> originalArgs = Collections.unmodifiableList(new ArrayList<>(args));
 
-        Map<String, String> polyglotOptions = defaultOptions;
-        if (polyglotOptions == null) {
-            polyglotOptions = new HashMap<>();
-        }
+        Map<String, String> polyglotOptions = new HashMap<>();
 
-        if (isAOT() && doNativeSetup) {
+        if (isAOT()) {
             System.setProperty("org.graalvm.launcher.languageId", getLanguageId());
         }
 
@@ -278,7 +275,7 @@ final void launch(List<String> args, Map<String, String> defaultOptions, boolean
             validateVmArguments(originalArgs, unrecognizedArgs);
         }
 
-        if (isAOT() && doNativeSetup && !IS_LIBPOLYGLOT) {
+        if (isAOT() && !IS_LIBPOLYGLOT) {
             assert nativeAccess != null;
             maybeExec(originalArgs, unrecognizedArgs, getDefaultVMType(), jniLaunch);
         }

From 9b71ba5785d981f9ef9a50b83a41a48184c5bc64 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Wed, 6 Aug 2025 16:10:07 +0200
Subject: [PATCH 3/5] [GR-66817] Make --polyglot the default in
 AbstractLanguageLauncher

* Improve the --help and error messages for --native and --jvm.
---
 .../launcher/AbstractLanguageLauncher.java    | 32 +++----
 .../launcher/LanguageLauncherBase.java        |  7 +-
 .../src/org/graalvm/launcher/Launcher.java    | 93 ++++---------------
 .../graalvm/polybench/PolyBenchLauncher.java  |  5 -
 4 files changed, 33 insertions(+), 104 deletions(-)

diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
index 7618bfa11bfc..f67e43fc771f 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
+++ b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/AbstractLanguageLauncher.java
@@ -289,14 +289,7 @@ final void launch(List<String> args) {
         validateArguments(polyglotOptions);
         argumentsProcessingDone();
 
-        Context.Builder builder;
-        if (isPolyglot()) {
-            builder = Context.newBuilder().options(polyglotOptions);
-        } else {
-            builder = Context.newBuilder(getDefaultLanguages()).options(polyglotOptions);
-        }
-
-        builder.allowAllAccess(true);
+        Context.Builder builder = Context.newBuilder().allowAllAccess(true).options(polyglotOptions);
         setupContextBuilder(builder);
 
         launch(builder);
@@ -305,16 +298,16 @@ final void launch(List<String> args) {
     /**
      * Process command line arguments by either saving the necessary state or adding it to the
      * {@code polyglotOptions}. Any unrecognized arguments should be accumulated and returned as a
-     * list. VM (--jvm/--native/--polyglot/--vm.*) and polyglot options (--language.option or
-     * --option) should be returned as unrecognized arguments to be automatically parsed and
-     * validated by {@link Launcher#parsePolyglotOption(String, Map, boolean, String)}.
-     *
+     * list. VM (--jvm/--native/--vm.*) and polyglot options (--language.option or --option) should
+     * be returned as unrecognized arguments to be automatically parsed and validated by
+     * {@link Launcher#parsePolyglotOption(String, Map, boolean, String)}.
+     * <p>
      * The {@code arguments} should not be modified, but doing so also has no effect.
-     *
+     * <p>
      * {@code polyglotOptions.put()} can be used to set launcher-specific default values when they
      * do not match the OptionKey's default.
-     *
-     * The {@code preprocessArguments} implementations can use {@link Engine} to inspect the the
+     * <p>
+     * The {@code preprocessArguments} implementations can use {@link Engine} to inspect the
      * installed {@link Engine#getLanguages() guest languages} and {@link Engine#getInstruments()
      * instruments}. But creating a {@link Context} or inspecting {@link Engine#getOptions() engine
      * options} is forbidden.
@@ -396,12 +389,15 @@ protected void runVersionAction(VersionAction action, Engine engine) {
     }
 
     /**
-     * The return value specifies what languages should be available by default when not using
-     * --polyglot. Note that TruffleLanguage.Registration#dependentLanguages() should be preferred
-     * in most cases.
+     * The return value used to specify what languages should be available by default when not using
+     * --polyglot. --polyglot is default since 26.0 so this is no longer used. Note that
+     * TruffleLanguage.Registration#dependentLanguages() should be preferred in most cases.
      *
+     * @deprecated no longer has any effect, all languages are always available for
+     *             AbstractLanguageLauncher.
      * @return an array of required language ids
      */
+    @Deprecated(since = "26.0")
     protected String[] getDefaultLanguages() {
         return new String[]{getLanguageId()};
     }
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/LanguageLauncherBase.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/LanguageLauncherBase.java
index b2237b83f14d..ce5f4ed3dcf9 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/LanguageLauncherBase.java
+++ b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/LanguageLauncherBase.java
@@ -74,7 +74,6 @@ public abstract class LanguageLauncherBase extends Launcher {
     private static final String WEBSITE_HEADER = "[website]";
 
     private static Engine tempEngine;
-    private boolean seenPolyglot;
     private VersionAction versionAction = VersionAction.None;
 
     static Engine getTempEngine() {
@@ -167,10 +166,6 @@ static List<Instrument> sortedInstruments(Engine engine) {
         return instruments;
     }
 
-    final boolean isPolyglot() {
-        return seenPolyglot;
-    }
-
     final void setupContextBuilder(Context.Builder builder) {
         Path logFile = getLogFile();
         if (logFile != null) {
@@ -214,7 +209,7 @@ protected boolean runLauncherAction() {
     protected boolean parseCommonOption(String defaultOptionPrefix, Map<String, String> polyglotOptions, boolean experimentalOptions, String arg) {
         switch (arg) {
             case "--polyglot":
-                seenPolyglot = true;
+                // the default, just ignore it
                 break;
             case "--version:graalvm":
                 versionAction = VersionAction.PrintAndExit;
diff --git a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
index c1011a77cff3..1d3d4f6bd41e 100644
--- a/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
+++ b/sdk/src/org.graalvm.launcher/src/org/graalvm/launcher/Launcher.java
@@ -91,7 +91,6 @@
 
 public abstract class Launcher {
     private static final boolean STATIC_VERBOSE = Boolean.getBoolean("org.graalvm.launcher.verbose");
-    private static final boolean SHELL_SCRIPT_LAUNCHER = Boolean.getBoolean("org.graalvm.launcher.shell");
 
     /**
      * Default option description indentation.
@@ -480,15 +479,15 @@ protected final void setOptionIndent(int indent) {
     protected abstract OptionDescriptor findOptionDescriptor(String group, String key);
 
     /**
-     * Determines if the tool supports polyglot. Returns true, if {@code --polyglot} option is valid
-     * for this tool and polyglot launcher works for it. The default implementation returns false
-     * only when {@link #isStandalone()} is true.
+     * Deprecated, always returns true.
      *
-     * @return {@code true}, if polyglot is relevant in this launcher.
+     * @deprecated always returns true.
+     * @return {@code true}
      * @since 20.0
      */
+    @Deprecated(since = "26.0")
     protected boolean canPolyglot() {
-        return !isStandalone();
+        return true;
     }
 
     /**
@@ -517,7 +516,7 @@ private String[] executableNames(String basename) {
 
     /**
      * Returns the name of the main class for this launcher.
-     *
+     * <p>
      * Typically:
      *
      * <pre>
@@ -629,22 +628,13 @@ protected boolean runLauncherAction() {
      * @since 20.0
      */
     protected void printDefaultHelp(OptionCategory printCategory) {
-        final VMType defaultVMType = SHELL_SCRIPT_LAUNCHER ? VMType.JVM : this.getDefaultVMType();
-
         printHelp(printCategory);
         out.println();
         out.println("Runtime options:");
 
         setOptionIndent(45);
-        if (canPolyglot()) {
-            launcherOption("--polyglot", "Run with all other guest languages accessible.");
-        }
-        if (!SHELL_SCRIPT_LAUNCHER) {
-            launcherOption("--native", "Run using the native launcher with limited access to Java libraries" + (defaultVMType == VMType.Native ? " (default)" : "") + ".");
-        }
-        if (!isStandalone()) {
-            launcherOption("--jvm", "Run on the Java Virtual Machine with access to Java libraries" + (defaultVMType == VMType.JVM ? " (default)" : "") + ".");
-        }
+        launcherOption("--native", "Ensure to run in Native mode.");
+        launcherOption("--jvm", "Ensure to run in JVM mode.");
         // @formatter:off
         launcherOption("--vm.[option]",                 "Pass options to the host VM. To see available options, use '--help:vm'.");
         launcherOption("--log.file=<String>",           "Redirect guest languages logging into a given file.");
@@ -693,7 +683,7 @@ static String optionsTitle(String kind, OptionCategory optionCategory) {
      * the generic launcher / VM ones.
      *
      * @param defaultOptionPrefix (language) prefix for the options
-     * @param polyglotOptions options being built for the polyglot launcher
+     * @param polyglotOptions options being built for the polyglot context
      * @param unrecognizedArgs arguments (options) to evaluate
      * @since 20.0
      */
@@ -723,8 +713,8 @@ protected final void parseUnrecognizedOptions(String defaultOptionPrefix, Map<St
     /**
      * Parses an option, returning success. The method is called to parse `arg` option from the
      * commandline, not recognized by the application. The method may contribute to the
-     * `polyglotOptions` (in/out parameter, modifiable) to alter polyglot behaviour. If the option
-     * is recognized, the method must return {@code true}.
+     * `polyglotOptions` (in/out parameter, modifiable) to alter polyglot options. If the option is
+     * recognized, the method must return {@code true}.
      *
      * @param defaultOptionPrefix default prefix for the option names, derived from the launching
      *            application.
@@ -792,12 +782,12 @@ private void parseHelpArg(String arg) {
     void parsePolyglotOption(String defaultOptionPrefix, Map<String, String> polyglotOptions, boolean experimentalOptions, String arg) {
         if (arg.equals("--jvm")) {
             if (isAOT()) {
-                throw abort("should not reach here: jvm option failed to switch to JVM");
+                throw abort("--jvm is not supported in a Native standalone");
             }
             return;
         } else if (arg.equals("--native")) {
             if (!isAOT()) {
-                throw abort("native options are not supported on the JVM");
+                throw abort("--native is not supported in a JVM standalone");
             }
             return;
         } else if (arg.startsWith("--vm.") && arg.length() > "--vm.".length()) {
@@ -883,9 +873,6 @@ void parsePolyglotOption(String defaultOptionPrefix, Map<String, String> polyglo
     private Set<String> collectAllArguments() {
         Set<String> options = new LinkedHashSet<>();
         collectArguments(options);
-        if (canPolyglot()) {
-            options.add("--polyglot");
-        }
         if (!isStandalone()) {
             options.add("--jvm");
         }
@@ -1223,10 +1210,10 @@ protected final void maybeNativeExec(List<String> args, boolean isPolyglotLaunch
      * {@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
-     * (except errors).
+     * The method parses the {@code unrecognizedArgs} for --jvm/--native 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 (except
+     * errors).
      *
      * @param originalArgs the original arguments from main(), unmodified.
      * @param unrecognizedArgs a subset of {@code originalArgs} that was not recognized by
@@ -1245,7 +1232,6 @@ protected final void maybeNativeExec(List<String> originalArgs, List<String> unr
     void maybeExec(List<String> originalArgs, List<String> unrecognizedArgs, VMType defaultVmType, boolean thinLauncher) {
         assert isAOT();
         VMType vmType = null;
-        boolean polyglot = false;
         List<String> jvmArgs = new ArrayList<>();
         List<String> applicationArgs = new ArrayList<>(originalArgs);
 
@@ -1284,14 +1270,10 @@ void maybeExec(List<String> originalArgs, List<String> unrecognizedArgs, VMType
                     vmOptions.add(vmArg);
                 }
                 iterator.remove();
-            } else if (arg.equals("--polyglot")) {
-                polyglot = true;
             }
         }
-        boolean isDefaultVMType = false;
         if (vmType == null) {
             vmType = defaultVmType;
-            isDefaultVMType = true;
         }
 
         if (vmType == VMType.JVM) {
@@ -1299,9 +1281,6 @@ void maybeExec(List<String> originalArgs, List<String> unrecognizedArgs, VMType
                 jvmArgs.add('-' + vmOption);
             }
 
-            if (polyglot) {
-                applicationArgs.add(0, "--polyglot");
-            }
             assert !isStandalone();
             if (thinLauncher) {
                 Map<String, String> env = new HashMap<>();
@@ -1328,14 +1307,6 @@ void maybeExec(List<String> originalArgs, List<String> unrecognizedArgs, VMType
              * option values.
              */
             VMRuntime.initialize();
-
-            if (polyglot) {
-                assert jvmArgs.isEmpty();
-                if (isStandalone()) {
-                    throw abort("--polyglot option is only supported when this launcher is part of a GraalVM.");
-                }
-                executePolyglot(applicationArgs, Collections.emptyMap(), !isDefaultVMType);
-            }
         }
     }
 
@@ -1357,24 +1328,8 @@ protected void executeJVM(String classpath, List<String> jvmArgs, List<String> r
         nativeAccess.execJVM(classpath, jvmArgs, remainingArgs);
     }
 
-    @SuppressWarnings("unused")
-    @Deprecated(since = "20.3")
-    protected void executePolyglot(List<String> mainArgs, Map<String, String> polyglotOptions, boolean forceNative) {
-        executePolyglot(mainArgs, forceNative);
-    }
-
-    /**
-     * Called to execute the bin/polyglot launcher with the supplied options. Subclasses may
-     * eventually override and implement in a different way.
-     *
-     * @param mainArgs program arguments
-     */
-    protected void executePolyglot(List<String> mainArgs, boolean forceNative) {
-        nativeAccess.executePolyglot(mainArgs, forceNative);
-    }
-
     class Native {
-        // execve() to JVM/polyglot from native if needed.
+        // execve() to JVM from native if needed.
         // Only parses --jvm/--native to find the VMType and --vm.* to pass/set the VM options.
 
         private void setNativeOption(String arg) {
@@ -1528,18 +1483,6 @@ private void printNativeHelp() {
             printBasicNativeHelp();
         }
 
-        private void executePolyglot(List<String> args, boolean forceNative) {
-            List<String> command = new ArrayList<>(args.size() + 3);
-            Path executable = getGraalVMBinaryPath("polyglot");
-            if (forceNative) {
-                command.add("--native");
-            }
-            command.add("--use-launcher");
-            command.add(getMainClass());
-            command.addAll(args);
-            exec(executable, command);
-        }
-
         private void execJVM(String classpath, List<String> jvmArgs, List<String> args) {
             // TODO use String[] for command to avoid a copy later
             List<String> command = new ArrayList<>(jvmArgs.size() + args.size() + 4);
diff --git a/truffle/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java b/truffle/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
index 8348a0317d86..8715411d58e5 100644
--- a/truffle/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
+++ b/truffle/src/org.graalvm.polybench/src/org/graalvm/polybench/PolyBenchLauncher.java
@@ -301,11 +301,6 @@ protected String getLanguageId() {
         return "js";
     }
 
-    @Override
-    protected String[] getDefaultLanguages() {
-        return new String[0];
-    }
-
     @Override
     protected void printHelp(OptionCategory maxCategory) {
         try {

From 8b2d14741410111f44af3f98c5e8225ea348452f Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Wed, 6 Aug 2025 20:07:36 +0200
Subject: [PATCH 4/5] Add ChangeLog entry

---
 sdk/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/CHANGELOG.md b/sdk/CHANGELOG.md
index c66d46db843e..41d40922c00b 100644
--- a/sdk/CHANGELOG.md
+++ b/sdk/CHANGELOG.md
@@ -6,6 +6,8 @@ This changelog summarizes major changes between GraalVM SDK versions. The main f
 * GR-65048: GR-65048: Introduced the `-Dpolyglot.engine.allowUnsupportedPlatform=true` system property to enable Truffle to run on unsupported platforms. If this property is enabled then the failure will be suppressed. Please see follow-up errors and warnings for instructions on how to continue. Note that using an unsupported platform will also force the fallback runtime without runtime optimization.
 * GR-66515 If neither a log handler nor the `log.file` option is set on the `Engine.Builder` or `Context.Builder`, Truffle and language log messages will be written to the Context’s error output stream by default. The `log.file` option is now also supported on `Context.Builder`.
 * GR-63588 A new entry (`Invalidated`) was added to the `opt deopt` truffle compilation logs. It is `true` or `false` depending on whether the compilation was also invalidated.
+* GR-66817 Make `--polyglot` the default for language launchers, so there is no need to specify it anymore to use other languages in standalones. As a result, `AbstractLanguageLauncher#getDefaultLanguages()` and `Launcher#canPolyglot()` have been deprecated.
+* GR-65404 Remove `PolyglotLauncher` as it is no longer used.
 
 ## Version 25.0.0
 * GR-60636 Truffle now stops compiling when the code cache fills up on HotSpot. A warning is printed when that happens.

From bf93eb7ebf60a975203a55c243c00055ef572c06 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <benoit.daloze@oracle.com>
Date: Mon, 11 Aug 2025 17:03:15 +0200
Subject: [PATCH 5/5] Adapt tests expecting an error without --polyglot

---
 vm/tests/all/agentscript/agent-r.test | 2 --
 1 file changed, 2 deletions(-)

diff --git a/vm/tests/all/agentscript/agent-r.test b/vm/tests/all/agentscript/agent-r.test
index 846c67ba9c5b..929db811698d 100644
--- a/vm/tests/all/agentscript/agent-r.test
+++ b/vm/tests/all/agentscript/agent-r.test
@@ -43,8 +43,6 @@ Ahoj
 < }
 < cat(fib(6))
 < cat('\n')
->[1] Rscript --jvm --insight=agent-histogram.js ${TMP_DIR}/fib.R
-.*insight: Access to language 'js' is not permitted.
 > Rscript --jvm --polyglot --insight=agent-histogram.js ${TMP_DIR}/fib.R
 8
 ==== Histogram ====