Add new specializaton to isSuperSet node.

Add baseClass support to IsBuiltinClassProfile

Rework IsBuiltinClassProfile

Author: Franziska Geiger

graalpython/com.oracle.graal.python.test/src/tests/test_set.py

@@ -187,6 +187,15 @@ def test_sub_and_super():
         assert not set('cbs').issuperset('a')
 
 
+def test_superset_list():
+    set = {1, 2, 3, 4}
+    list = [1, 2, 3, 4]
+    visited= False
+    if set.issuperset(list):
+        visited = True
+    assert visited
+
+
 def test_intersection():
     word = 'simsalabim'
     otherword = 'madagascar'

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/builtins/objects/set/FrozenSetBuiltins.java

@@ -72,6 +72,7 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
+import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.dsl.Cached;
@@ -489,7 +490,15 @@ boolean isSuperSet(VirtualFrame frame, PBaseSet self, PBaseSet other,
         }
 
         @Specialization
-        boolean isSuperSet(VirtualFrame frame, PBaseSet self, String other,
+        boolean isSuperSetPSequence(VirtualFrame frame, PBaseSet self, PSequence other,
+                           @Cached("create()") SetNodes.ConstructSetNode constructSetNode,
+                           @Cached("create()") HashingStorageNodes.KeysIsSupersetNode isSupersetNode) {
+            PSet otherSet = constructSetNode.executeWith(frame, other);
+            return isSupersetNode.execute(frame, self.getDictStorage(), otherSet.getDictStorage());
+        }
+
+        @Specialization
+        boolean isSuperSetString(VirtualFrame frame, PBaseSet self, String other,
                         @Cached("create()") SetNodes.ConstructSetNode constructSetNode,
                         @Cached("create()") HashingStorageNodes.KeysIsSupersetNode isSupersetNode) {
             PSet otherSet = constructSetNode.executeWith(frame, other);

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) {