load builtin modules with correct classloader (language classloader)

cosminbasca · cosminbasca · commit 8e2aed1e26ed · 2019-04-02T11:51:56.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java
@@ -346,7 +346,7 @@ private static final PythonBuiltins[] initializeBuiltins() {
                         new RLockBuiltins(),
                         new ContextvarsModuleBuiltins()));
         if (!TruffleOptions.AOT) {
-            ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class);
+            ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());
             for (PythonBuiltins builtin : providers) {
                 builtins.add(builtin);
             }

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ private static final PythonBuiltins[] initializeBuiltins() {`
`346`	`346`	`new RLockBuiltins(),`
`347`	`347`	`new ContextvarsModuleBuiltins()));`
`348`	`348`	`if (!TruffleOptions.AOT) {`
`349`		`- ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class);`
	`349`	`+ ServiceLoader<PythonBuiltins> providers = ServiceLoader.load(PythonBuiltins.class, Python3Core.class.getClassLoader());`
`350`	`350`	`for (PythonBuiltins builtin : providers) {`
`351`	`351`	`builtins.add(builtin);`
`352`	`352`	`}`