Fix foreign conversion guard

msimacek · msimacek · commit 7cc8271d5eee · 2020-11-27T15:45:24.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/interop/PForeignToPTypeNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/interop/PForeignToPTypeNode.java
@@ -60,7 +60,7 @@ public abstract class PForeignToPTypeNode extends Node {
     public abstract Object executeConvert(Object value);
 
     protected static boolean isOtherClass(Class<?> clazz) {
-        return !(clazz == Byte.class || clazz == Short.class || clazz == Float.class || clazz == Character.class);
+        return !(clazz == Byte.class || clazz == Short.class || clazz == Float.class || clazz == Character.class || clazz == PException.class);
     }
 
     @Specialization(guards = {"value.getClass() == cachedClass", "isOtherClass(cachedClass)"}, limit = "1")

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public abstract class PForeignToPTypeNode extends Node {`
`60`	`60`	`public abstract Object executeConvert(Object value);`
`61`	`61`
`62`	`62`	`protected static boolean isOtherClass(Class<?> clazz) {`
`63`		`- return !(clazz == Byte.class \|\| clazz == Short.class \|\| clazz == Float.class \|\| clazz == Character.class);`
	`63`	`+ return !(clazz == Byte.class \|\| clazz == Short.class \|\| clazz == Float.class \|\| clazz == Character.class \|\| clazz == PException.class);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Specialization(guards = {"value.getClass() == cachedClass", "isOtherClass(cachedClass)"}, limit = "1")`