Set context classloader before calling Polyglot to bylass module CL

manojetic · May 7, 2023 · 5c81e4e · 5c81e4e
1 parent 630d063
commit 5c81e4e
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 13 deletions.
diff --git a/ide/libs.graalsdk.system/src/org/netbeans/libs/graalsdk/system/GraalContext.java b/ide/libs.graalsdk.system/src/org/netbeans/libs/graalsdk/system/GraalContext.java
@@ -86,14 +86,18 @@ final synchronized Context ctx() {
             } else {
                 b.allowHostAccess(SANDBOX);
             }
-            ctx = b.build();
-            if (globals != null) {
-                for (String k : globals.keySet()) {
-                    if (!ALLOW_ALL_ACCESS.equals(k)) {
-                        ctx.getPolyglotBindings().putMember(k, globals.get(k));
+
+            executeWithClassLoader(() -> {
+                ctx = b.build();
+                if (globals != null) {
+                    for (String k : globals.keySet()) {
+                        if (!ALLOW_ALL_ACCESS.equals(k)) {
+                            ctx.getPolyglotBindings().putMember(k, globals.get(k));
+                        }
                     }
                 }
-            }
+                return null;
+            }, org.graalvm.polyglot.Engine.class.getClassLoader());
         }
         return ctx;
     }
@@ -130,7 +134,10 @@ public void setBindings(Bindings bindings, int scope) {
     public Bindings getBindings(int scope) {
         assertGlobalScope(scope);
         if (bindings == null) {
-            Map<String,Object> map = ctx().getPolyglotBindings().as(Map.class);
+            Map<String,Object> map = executeWithClassLoader(
+                    () -> ctx().getPolyglotBindings().as(Map.class),
+                    org.graalvm.polyglot.Engine.class.getClassLoader()
+            );
             bindings = new SimpleBindings(map);
         }
         return bindings;

diff --git a/ide/libs.graalsdk.system/src/org/netbeans/libs/graalsdk/system/GraalEngine.java b/ide/libs.graalsdk.system/src/org/netbeans/libs/graalsdk/system/GraalEngine.java
@@ -24,6 +24,7 @@
 import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
+import org.graalvm.polyglot.Engine;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
 import org.graalvm.polyglot.Value;
@@ -63,7 +64,9 @@ private static interface ScriptAction {
     }
 
     private Value handleException(ScriptAction r) throws ScriptException {
+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
         try {
+            Thread.currentThread().setContextClassLoader(Engine.class.getClassLoader());
             return r.run();
         } catch (PolyglotException e) {
             if (e.isHostException()) {
@@ -72,6 +75,8 @@ private Value handleException(ScriptAction r) throws ScriptException {
             }
             // avoid exposing polyglot stack frames - might be confusing.
             throw new ScriptException(e);
+        } finally {
+            Thread.currentThread().setContextClassLoader(cl);
         }
     }
 
@@ -118,7 +123,8 @@ public Object get(String arg0) {
 
     @Override
     public Bindings getBindings(int scope) {
-        return getContext().getBindings(scope);
+        return GraalContext.executeWithClassLoader(() ->getContext().getBindings(scope),
+                Engine.class.getClassLoader());
     }
 
     @Override

diff --git a/...ibs.graalsdk.system/src/org/netbeans/libs/graalsdk/system/GraalSystemEnginesProvider.java b/...ibs.graalsdk.system/src/org/netbeans/libs/graalsdk/system/GraalSystemEnginesProvider.java
@@ -57,10 +57,14 @@ public List<ScriptEngineFactory> factories(ScriptEngineManager m) {
 
     private void enumerateLanguages(List<ScriptEngineFactory> arr, Bindings globals) {
         final GraalContext ctx = new GraalContext(globals, Lookup.getDefault().lookup(ClassLoader.class));
-        try (Engine engine = Engine.newBuilder().build()) {
-            for (Map.Entry<String, Language> entry : engine.getLanguages().entrySet()) {
-                arr.add(new GraalEngineFactory(ctx, entry.getKey(), entry.getValue()));
+        GraalContext.executeWithClassLoader(() -> {
+            Engine.Builder b = Engine.newBuilder();
+            try (Engine engine = b.build()) {
+                for (Map.Entry<String, Language> entry : engine.getLanguages().entrySet()) {
+                    arr.add(new GraalEngineFactory(ctx, entry.getKey(), entry.getValue()));
+                }
             }
-        }
+            return null;
+        }, Engine.class.getClassLoader());
     }
 }
diff --git a/ide/libs.graalsdk.system/src/org/netbeans/libs/graalsdk/system/LangContext.java b/ide/libs.graalsdk.system/src/org/netbeans/libs/graalsdk/system/LangContext.java
@@ -59,7 +59,9 @@ public Bindings getBindings(int scope) {
                 Context c = global.ctx();
                 synchronized (this) {
                     if (langBindings == null) {
-                        langBindings = new SimpleBindings(c.getBindings(langId).as(Map.class));
+                        langBindings = new SimpleBindings(
+                                GraalContext.executeWithClassLoader(() -> c.getBindings(langId).as(Map.class),
+                                        org.graalvm.polyglot.Engine.class.getClassLoader()));
                     }
                 }
             }

diff --git a/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/impl/GraalEnginesProvider.java b/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/impl/GraalEnginesProvider.java
@@ -94,6 +94,9 @@ private ClassLoader createGraalDependentClassLoader() {
             added = false;
             for (Iterator<? extends ModuleInfo> it = modules.iterator(); it.hasNext(); ) {
                 ModuleInfo m = it.next();
+                if (!m.isEnabled()) {
+                    continue;
+                }
                 for (Dependency d : m.getDependencies()) {
                     if (d.getType() == Dependency.TYPE_MODULE) {
                         if (dependentsOfSDK.keySet().contains(d.getName())) {
@@ -137,6 +140,15 @@ private ClassLoader createGraalDependentClassLoader() {
     private void enumerateLanguages(List<ScriptEngineFactory> arr, Bindings globals) {
         ClassLoader langLoader = createGraalDependentClassLoader();
         final GraalContext ctx = new GraalContext(globals, langLoader);
+        String specVersion = System.getProperty("java.specification.version"); //NOI18N
+        String vmVersion = System.getProperty("java.vm.version"); //NOI18N
+        if ("1.8".equals(specVersion) && vmVersion.contains("jvmci-")) { //NOI18N
+            // this is GraalVM 8, whose JVMCI support returns a PolyglotImpl from the system classloader
+            // incompatible with PolyglotImpl bundled in this module's libraries.
+            // GraalVM 8 always contains (mandatory) JS implementation, so the JS is loaded by libs.graalsdk.system module.
+            // No need to offer a bundled GraalVM implementation and in fact, it is not even possible.
+            return;
+        }
         GraalContext.executeWithClassLoader(() -> {
             try (Engine engine = Engine.newBuilder().build()) {
                 for (Map.Entry<String, Language> entry : engine.getLanguages().entrySet()) {