Add baseClass support to IsBuiltinClassProfile

Rework IsBuiltinClassProfile

Author: Franziska Geiger

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java

@@ -266,7 +266,7 @@ protected boolean wrappedString(PString s) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 isBuiltinClassProfile = IsBuiltinClassProfile.create();
             }
-            return isBuiltinClassProfile.profileClass(getClass(s), PythonBuiltinClassType.PString);
+            return isBuiltinClassProfile.profileClassWithBaseClasses(getClass(s), PythonBuiltinClassType.PString);
         }
 
         protected EconomicMapStorage switchToEconomicMap(HashingStorage storage) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/object/IsBuiltinClassProfile.java

@@ -45,6 +45,7 @@
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.PythonBuiltinClass;
+import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
@@ -205,6 +206,20 @@ public boolean profileClass(LazyPythonClass clazz, PythonBuiltinClassType type)
         }
     }
 
+    public boolean profileClassWithBaseClasses(LazyPythonClass clazz, PythonBuiltinClassType type){
+        if (!profileClass(clazz,type)) {
+            PythonAbstractClass [] baseClasses = ((PythonClass) clazz).getBaseClasses();
+            for (PythonAbstractClass baseClazz : baseClasses) {
+                if (profileClass(baseClazz, type)) {
+                    return true;
+                }
+            }
+            return false;
+        } else {
+            return true;
+        }
+    }
+
     public boolean profileClass(PythonAbstractClass clazz, PythonBuiltinClassType type) {
         if (clazz instanceof PythonBuiltinClass) {
             if (!isBuiltinClass) {