Correctly propagate flag BASE_EXC_SUBCLASS to exception types.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

@@ -50,6 +50,7 @@
 import com.oracle.truffle.api.library.CachedLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.object.Shape;
 
 @ExportLibrary(InteropLibrary.class)
@@ -278,8 +279,8 @@ public final Shape getInstanceShape() {
         return instanceShape;
     }
 
-    public static final PythonBuiltinClassType[] VALUES = Arrays.copyOf(values(), values().length - 1);
-    public static final PythonBuiltinClassType[] EXCEPTIONS;
+    @CompilationFinal(dimensions = 1) public static final PythonBuiltinClassType[] VALUES = Arrays.copyOf(values(), values().length - 1);
+    @CompilationFinal(dimensions = 1) public static final PythonBuiltinClassType[] EXCEPTIONS;
 
     static {
         // fill the EXCEPTIONS array
@@ -577,4 +578,14 @@ static String getMetaSimpleName(PythonBuiltinClassType self) {
     static String getMetaQualifiedName(PythonBuiltinClassType self) {
         return self.getQualifiedName();
     }
+
+    @ExplodeLoop
+    public static boolean isExceptionType(PythonBuiltinClassType type) {
+        for (int i = 0; i < EXCEPTIONS.length; i++) {
+            if (EXCEPTIONS[i] == type) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

@@ -213,7 +213,7 @@ static long doBuiltinClassType(PythonBuiltinClassType clazz) {
                     // default case; this includes:
                     // PythonObject, PByteArray, PCode, PInstancemethod, PFloat, PNone,
                     // PNotImplemented, PEllipsis
-                    result = DEFAULT | (clazz.isAcceptableBase() ? BASETYPE : 0);
+                    result = DEFAULT | (clazz.isAcceptableBase() ? BASETYPE : 0) | (PythonBuiltinClassType.isExceptionType(clazz) ? BASE_EXC_SUBCLASS : 0L);
                     break;
             }
             // we always claim that all types are fully initialized