[GR-44626] Espresso interop fixes relating to foreign exceptions.

PullRequest: graal/13969

Author: javeleon

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/nodes/interop/ToEspressoNode.java

@@ -64,6 +64,8 @@
 @GenerateUncached
 public abstract class ToEspressoNode extends EspressoNode {
 
+    public abstract Object execute(Object value, Klass targetType) throws UnsupportedTypeException;
+
     public static final int LIMIT = 2;
 
     // region Specialization predicates
@@ -137,11 +139,6 @@ static boolean isBoxedPrimitive(Object obj) {
         return obj instanceof Number || obj instanceof Character || obj instanceof Boolean;
     }
 
-    static boolean isForeignException(Klass klass) {
-        Meta meta = klass.getMeta();
-        return meta.polyglot != null /* polyglot enabled */ && meta.polyglot.ForeignException.equals(klass);
-    }
-
     static boolean isIntegerCompatible(Klass klass) {
         return klass.isAssignableFrom(klass.getMeta().java_lang_Integer);
     }
@@ -188,8 +185,6 @@ static boolean isHostObject(EspressoContext context, Object value) {
 
     // endregion Specialization predicates
 
-    public abstract Object execute(Object value, Klass targetType) throws UnsupportedTypeException;
-
     @Specialization(guards = "!isPrimitiveKlass(klass)")
     Object doEspresso(StaticObject value, Klass klass,
                     @Cached BranchProfile exceptionProfile,
@@ -545,6 +540,10 @@ Object doForeignClassProxy(Object value, ObjectKlass klass,
                 }
             } else {
                 if (klass == meta.java_lang_Object) {
+                    // check if foreign exception
+                    if (interop.isException(value)) {
+                        return StaticObject.createForeignException(klass.getContext(), value, interop);
+                    }
                     // see if a generated proxy can be used for interface mapped types
                     ObjectKlass proxyKlass = lookupProxyKlassNode.execute(metaObject, metaName, klass);
                     if (proxyKlass != null) {

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/substitutions/Target_com_oracle_truffle_espresso_polyglot_Interop.java

@@ -1974,6 +1974,9 @@ StaticObject doCached(
             } catch (InteropException e) {
                 exceptionProfile.enter();
                 throw throwInteropExceptionAsGuest.execute(e);
+            } catch (EspressoException e) {
+                // make sure we don't try to convert espresso exceptions
+                throw e;
             } catch (AbstractTruffleException ex) {
                 exceptionProfile.enter();
                 StaticObject foreignException = getAllocator().createForeignException(getContext(), ex, exceptionInterop);