Remove logic for polyglot and libpolyglot

Author: eregon

.github/workflows/main.yml

@@ -152,8 +152,6 @@ jobs:
               PRIMARY: "vm"
               DYNAMIC_IMPORTS: "/sulong,/substratevm"
               NATIVE_IMAGES: "graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:llvmvm"
-              DISABLE_POLYGLOT: true
-              DISABLE_LIBPOLYGLOT: true
           - env:
               JDK_VERSION: "latest"
               GATE_TAGS: "build"

espresso-compiler-stub/mx.espresso-compiler-stub/espresso-ni

@@ -2,4 +2,3 @@
 DYNAMIC_IMPORTS=/vm,/substratevm
 COMPONENTS=Java on Truffle,Espresso Standalone jvm.cfg,SubstrateVM,tflm,ni,sdkni,svmt,svmsl,tflc,tflsm,ecs
 NATIVE_IMAGES=lib:javavm
-DISABLE_LIBPOLYGLOT=true

espresso-compiler-stub/mx.espresso-compiler-stub/espresso-ni-jvm

@@ -2,4 +2,3 @@
 DYNAMIC_IMPORTS=/vm,/substratevm
 COMPONENTS=Espresso Launcher,LibGraal,Java on Truffle,SubstrateVM,Java on Truffle LLVM Java libraries,tflm,ni,sdkni,svmt,svmsl,tflc,tflsm,ecs
 NATIVE_IMAGES=lib:jvmcicompiler
-DISABLE_LIBPOLYGLOT=true

espresso/mx.espresso/mx_espresso.py

@@ -429,8 +429,6 @@ def contents(self):
     truffle_jars=['espresso:ESPRESSO', 'espresso-shared:ESPRESSO_SHARED'],
     support_distributions=['espresso:ESPRESSO_GRAALVM_SUPPORT'],
     library_configs=[espresso_library_config],
-    polyglot_lib_jar_dependencies=['espresso:LIB_JAVAVM'],
-    has_polyglot_lib_entrypoints=True,
     priority=1,
     stability=_espresso_stability,
 ))

sdk/mx.sdk/mx_sdk_vm.py

@@ -320,10 +320,10 @@ def __init__(self,
         self.third_party_license_files = third_party_license_files
         self.dependency_names = dependencies or []
         self.provided_executables = provided_executables or []
-        self.polyglot_lib_build_args = polyglot_lib_build_args or []
-        self.polyglot_lib_jar_dependencies = polyglot_lib_jar_dependencies or []
-        self.polyglot_lib_build_dependencies = polyglot_lib_build_dependencies or []
-        self.has_polyglot_lib_entrypoints = has_polyglot_lib_entrypoints
+        self.polyglot_lib_build_args = []
+        self.polyglot_lib_jar_dependencies = []
+        self.polyglot_lib_build_dependencies = []
+        self.has_polyglot_lib_entrypoints = False
         self.boot_jars = boot_jars or []
         self.jvmci_parent_jars = jvmci_parent_jars or []
         self.jar_distributions = jar_distributions or []
@@ -372,16 +372,11 @@ def __init__(self,
         assert isinstance(self.license_files, list)
         assert isinstance(self.third_party_license_files, list)
         assert isinstance(self.provided_executables, list)
-        assert isinstance(self.polyglot_lib_build_args, list)
-        assert isinstance(self.polyglot_lib_jar_dependencies, list)
-        assert isinstance(self.polyglot_lib_build_dependencies, list)
         assert isinstance(self.boot_jars, list)
         assert isinstance(self.jvmci_parent_jars, list)
         assert isinstance(self.launcher_configs, list)
         assert isinstance(self.library_configs, list)
 
-        assert not any(cp_arg in self.polyglot_lib_build_args for cp_arg in ('-cp', '-classpath')), "the '{}' component passes a classpath argument to libpolylgot: '{}'. Use `polyglot_lib_jar_dependencies` instead".format(self.name, ' '.join(self.polyglot_lib_build_args))
-
     def __str__(self):
         return "{} ({})".format(self.name, self.dir_name)
 
@@ -1174,7 +1169,7 @@ def verify_graalvm_configs(suites=None, start_from=None, check_all=False):
     """
     import mx_sdk_vm_impl
     child_env = os.environ.copy()
-    for env_var in ['DYNAMIC_IMPORTS', 'DEFAULT_DYNAMIC_IMPORTS', 'COMPONENTS', 'EXCLUDE_COMPONENTS', 'SKIP_LIBRARIES', 'NATIVE_IMAGES', 'FORCE_BASH_LAUNCHERS', 'DISABLE_POLYGLOT', 'DISABLE_LIBPOLYGLOT']:
+    for env_var in ['DYNAMIC_IMPORTS', 'DEFAULT_DYNAMIC_IMPORTS', 'COMPONENTS', 'EXCLUDE_COMPONENTS', 'SKIP_LIBRARIES', 'NATIVE_IMAGES', 'FORCE_BASH_LAUNCHERS']:
         if env_var in child_env:
             del child_env[env_var]
     started = start_from is None

sdk/mx.sdk/mx_sdk_vm_impl.py

@@ -33,8 +33,6 @@ The base GraalVM CE image includes:
 - Sulong
 - Graal.nodejs
 - Graal.js (imported as a dependency of `graal-nodejs`)
-- the `polyglot` launcher
-- the `libpolyglot` shared library
 
 In our CI, we build it using:
 - the latest JVMCI-enabled JDK8 ([pre-built archives](https://github.com/graalvm/openjdk8-jvmci-builder/releases); [build instructions](https://github.com/graalvm/openjdk8-jvmci-builder)). The `JAVA_HOME` environment variable must point to it.
@@ -54,21 +52,19 @@ Which uses the settings in the env file in `mx.vm/ce`. Note that you can add cus
 
 2.
 ```bash
-$ mx --dynamicimports /substratevm,/tools,/sulong,/graal-nodejs --exclude-components=nju,nic,ni,nil,llp --force-bash-launchers=polyglot build
+$ mx --dynamicimports /substratevm,/tools,/sulong,/graal-nodejs --exclude-components=nju,nic,ni,nil,llp build
 ```
 
 3.
 ```bash
 $ export DEFAULT_DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-nodejs
 $ export EXCLUDE_COMPONENTS=nju,nic,ni,nil,llp
-$ export FORCE_BASH_LAUNCHERS=polyglot
 $ mx build
 ```
 or:
 ```bash
 $ export DYNAMIC_IMPORTS=/substratevm,/tools,/sulong,/graal-nodejs
 $ export EXCLUDE_COMPONENTS=nju,nic,ni,nil,llp
-$ export FORCE_BASH_LAUNCHERS=polyglot
 $ mx build
 ```
 Note that the suites listed in:
@@ -88,41 +84,26 @@ creates:
 
 
 ## Native images
-When `substratevm` is imported, the build system creates native launchers for the supported languages and for `polyglot`, plus the shared polyglot library (`libpolyglot`).
-Otherwise, it creates bash launchers for the languages and for `polyglot`, and does not create the shared polyglot library.
+When `substratevm` is imported, the build system creates native launchers for the supported languages.
+Otherwise, it creates bash launchers for the languages.
 
 To override the default behavior, the `vm` suite defines the following `mx` arguments:
 ```
-  --native-images=...           Comma-separated list of launchers and libraries (syntax: lib:polyglot) to build with Native Image.
-  --disable-libpolyglot         Disable the 'polyglot' library project
-  --disable-polyglot            Disable the 'polyglot' launcher project
+  --native-images=...           Comma-separated list of launchers and libraries (syntax: lib:jsvm) to build with Native Image.
   --force-bash-launchers=...    Force the use of bash launchers instead of native images.
                                 This can be a comma-separated list of disabled launchers or `true` to disable all native launchers.
 ```
 And the following environment variables:
 ```
   NATIVE_IMAGES                 Same as '--native-images'
-  DISABLE_LIBPOLYGLOT           Same as '--disable-libpolyglot'
-  DISABLE_POLYGLOT              Same as '--disable-polyglot'
   FORCE_BASH_LAUNCHERS          Same as '--force-bash-launchers'
 ```
 
-Note that when the shared polyglot library is not built, Graal.nodejs can only work in JVM-mode (`node --jvm [args]`).
-
-
-### Example: avoid building the polyglot image and the polyglot shared library
-
-```bash
-$ mx --disable-polyglot --disable-libpolyglot --dynamicimports /substratevm,/tools,/sulong,/graal-js build
-```
-builds the native SubstrateVM launchers for native-image, Graal.js, and Sulong, but no polyglot launcher and polyglot library.
-
-
 ### Example: force bash launchers
 ```bash
 $ mx --force-bash-launchers=true --dynamicimports /substratevm,/tools,/sulong,/graal-nodejs build
 ```
-builds the native SubstrateVM launcher for native-image, and creates bash launchers for Sulong, Graal.js, and `polyglot`
+builds the native SubstrateVM launcher for native-image, and creates bash launchers for Sulong and Graal.js
 
 ### Example: build only TruffleRuby with bash launchers
 ```bash

vm/README.md

@@ -557,7 +557,7 @@ local devkits = graal_common.devkits;
   local sulong_vm_tests = graal_common.deps.svm + graal_common.deps.sulong + vm.custom_vm + self.vm_base('linux', 'amd64', 'gate') + {
      run: [
        ['export', 'SVM_SUITE=' + vm.svm_suite],
-       ['mx', '--dynamicimports', '$SVM_SUITE,/sulong', '--disable-polyglot', '--disable-libpolyglot', 'gate', '--no-warning-as-error', '--tags', 'build,sulong'],
+       ['mx', '--dynamicimports', '$SVM_SUITE,/sulong', 'gate', '--no-warning-as-error', '--tags', 'build,sulong'],
      ],
      timelimit: '1:00:00',
      name: 'gate-vm-native-sulong-' + self.jdk_name + '-linux-amd64',

vm/ci/ci_common/common.jsonnet

@@ -1,4 +1,4 @@
-# mx --dy /espresso,/substratevm,/regex,/tools --components="Espresso libjvm,Espresso Standalone jvm.cfg,Java on Truffle,Truffle Macro,GraalVM license files,TRegex,suite:tools" --disable-libpolyglot --non-rebuildable-images=lib:javavm graalvm-show --print-env
+# mx --dy /espresso,/substratevm,/regex,/tools --components="Espresso libjvm,Espresso Standalone jvm.cfg,Java on Truffle,Truffle Macro,GraalVM license files,TRegex,suite:tools" --non-rebuildable-images=lib:javavm graalvm-show --print-env
 DYNAMIC_IMPORTS=/espresso,/regex,/sdk,/substratevm,/tools,/truffle,/vm
 COMPONENTS=cov,dap,ejc,ejvm,gvm,icu4j,ins,insight,insightheap,java,lsp,nfi,nfi-libffi,pro,rgx,sdk,sdkc,sdkl,sdkni,tfl,tfla,tflc,tflm,truffle-json
 EXCLUDE_COMPONENTS=libpoly

vm/mx.vm/ce-espresso

@@ -1,4 +1,4 @@
-# mx --dy /espresso,/substratevm,/sulong,/regex,/tools --components="Espresso libjvm,Espresso Standalone jvm.cfg,Java on Truffle LLVM Java libraries,Java on Truffle,LLVM Runtime Native,LLVM.org toolchain,Truffle Macro,GraalVM license files,TRegex,suite:tools" --disable-libpolyglot --non-rebuildable-images=lib:javavm graalvm-show --print-env
+# mx --dy /espresso,/substratevm,/sulong,/regex,/tools --components="Espresso libjvm,Espresso Standalone jvm.cfg,Java on Truffle LLVM Java libraries,Java on Truffle,LLVM Runtime Native,LLVM.org toolchain,Truffle Macro,GraalVM license files,TRegex,suite:tools" --non-rebuildable-images=lib:javavm graalvm-show --print-env
 DYNAMIC_IMPORTS=/espresso,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,/vm
 COMPONENTS=antlr4,cov,dap,ejc,ejvm,ellvm,gvm,icu4j,ins,insight,insightheap,java,llp,llrc,llrlf,llrn,lsp,nfi,nfi-libffi,pro,rgx,sdk,sdkc,sdkl,sdkni,tfl,tfla,tflc,tflm,truffle-json
 EXCLUDE_COMPONENTS=libpoly