Make sure we convert unexpected Java types before they reach the Python object space

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PolyglotModuleBuiltins.java

@@ -111,6 +111,7 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.interop.InteropBehavior;
 import com.oracle.graal.python.nodes.interop.InteropBehaviorMethod;
+import com.oracle.graal.python.nodes.interop.PForeignToPTypeNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
@@ -191,7 +192,8 @@ public void initialize(Python3Core core) {
     public abstract static class ImportNode extends PythonBuiltinNode {
         @Specialization
         @TruffleBoundary
-        Object importSymbol(TruffleString name) {
+        Object importSymbol(TruffleString name,
+                        @Cached PForeignToPTypeNode convert) {
             Env env = getContext().getEnv();
             if (!env.isPolyglotBindingsAccessAllowed()) {
                 throw PRaiseNode.raiseUncached(this, PythonErrorType.NotImplementedError, ErrorMessages.POLYGLOT_ACCESS_NOT_ALLOWED);
@@ -200,7 +202,7 @@ Object importSymbol(TruffleString name) {
             if (object == null) {
                 return PNone.NONE;
             }
-            return object;
+            return convert.executeConvert(object);
         }
     }
 
@@ -209,7 +211,8 @@ Object importSymbol(TruffleString name) {
     abstract static class EvalInteropNode extends PythonBuiltinNode {
         @TruffleBoundary
         @Specialization
-        Object evalString(@SuppressWarnings("unused") PNone path, TruffleString tvalue, TruffleString tlangOrMimeType) {
+        Object evalString(@SuppressWarnings("unused") PNone path, TruffleString tvalue, TruffleString tlangOrMimeType,
+                        @Shared @Cached PForeignToPTypeNode convert) {
             Env env = getContext().getEnv();
             if (!env.isPolyglotEvalAllowed()) {
                 throw PRaiseNode.raiseUncached(this, PythonErrorType.NotImplementedError, ErrorMessages.POLYGLOT_ACCESS_NOT_ALLOWED);
@@ -224,7 +227,7 @@ Object evalString(@SuppressWarnings("unused") PNone path, TruffleString tvalue,
                 if (mimeType) {
                     newBuilder = newBuilder.mimeType(langOrMimeType);
                 }
-                return env.parsePublic(newBuilder.build()).call();
+                return convert.executeConvert(env.parsePublic(newBuilder.build()).call());
             } catch (RuntimeException e) {
                 throw PRaiseNode.raiseUncached(this, NotImplementedError, e);
             }
@@ -239,7 +242,8 @@ private void raiseIfInternal(Env env, String lang) {
 
         @TruffleBoundary
         @Specialization
-        Object evalFile(TruffleString tpath, @SuppressWarnings("unused") PNone string, TruffleString tlangOrMimeType) {
+        Object evalFile(TruffleString tpath, @SuppressWarnings("unused") PNone string, TruffleString tlangOrMimeType,
+                        @Shared @Cached PForeignToPTypeNode convert) {
             Env env = getContext().getEnv();
             if (!env.isPolyglotEvalAllowed()) {
                 throw PRaiseNode.raiseUncached(this, PythonErrorType.NotImplementedError, ErrorMessages.POLYGLOT_ACCESS_NOT_ALLOWED);
@@ -254,7 +258,7 @@ Object evalFile(TruffleString tpath, @SuppressWarnings("unused") PNone string, T
                 if (mimeType) {
                     newBuilder = newBuilder.mimeType(langOrMimeType);
                 }
-                return getContext().getEnv().parsePublic(newBuilder.name(path).build()).call();
+                return convert.executeConvert(getContext().getEnv().parsePublic(newBuilder.name(path).build()).call());
             } catch (IOException e) {
                 throw PRaiseNode.raiseUncached(this, OSError, ErrorMessages.S, e);
             } catch (RuntimeException e) {
@@ -264,14 +268,15 @@ Object evalFile(TruffleString tpath, @SuppressWarnings("unused") PNone string, T
 
         @TruffleBoundary
         @Specialization
-        Object evalFile(TruffleString tpath, @SuppressWarnings("unused") PNone string, @SuppressWarnings("unused") PNone lang) {
+        Object evalFile(TruffleString tpath, @SuppressWarnings("unused") PNone string, @SuppressWarnings("unused") PNone lang,
+                        @Shared @Cached PForeignToPTypeNode convert) {
             Env env = getContext().getEnv();
             if (!env.isPolyglotEvalAllowed()) {
                 throw PRaiseNode.raiseUncached(this, PythonErrorType.NotImplementedError, ErrorMessages.POLYGLOT_ACCESS_NOT_ALLOWED);
             }
             try {
                 String path = tpath.toJavaStringUncached();
-                return getContext().getEnv().parsePublic(Source.newBuilder(PythonLanguage.ID, env.getPublicTruffleFile(path)).name(path).build()).call();
+                return convert.executeConvert(getContext().getEnv().parsePublic(Source.newBuilder(PythonLanguage.ID, env.getPublicTruffleFile(path)).name(path).build()).call());
             } catch (IOException e) {
                 throw PRaiseNode.raiseUncached(this, OSError, ErrorMessages.S, e);
             } catch (RuntimeException e) {