Revert changes from other PR

Author: Franziska Geiger

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

@@ -457,39 +457,3 @@ def test_unhashable_key():
     assert_raises(TypeError, lambda: d[key_list])
     key_tuple_list = (key_list, 2)
     assert_raises(TypeError, lambda: d[key_tuple_list])
-
-class EncodedString(str):
-    # unicode string subclass to keep track of the original encoding.
-    # 'encoding' is None for unicode strings and the source encoding
-    # otherwise
-    encoding = None
-
-    def __deepcopy__(self, memo):
-        return self
-
-    def byteencode(self):
-        assert self.encoding is not None
-        return self.encode(self.encoding)
-
-    def utf8encode(self):
-        assert self.encoding is None
-        return self.encode("UTF-8")
-
-    @property
-    def is_unicode(self):
-        return self.encoding is None
-
-    def contains_surrogates(self):
-        return string_contains_surrogates(self)
-
-    def as_utf8_string(self):
-        return bytes_literal(self.utf8encode(), 'utf8')
-
-
-def test_wrapped_string_contains():
-    testString = EncodedString('something')
-    dict = {'something': (1, 0), 'nothing': (2, 0)}
-    reached = False
-    if testString in dict:
-        reached = True
-    assert reached

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.profileClassWithBaseClasses(getClass(s), PythonBuiltinClassType.PString);
+            return isBuiltinClassProfile.profileClass(getClass(s), PythonBuiltinClassType.PString);
         }
 
         protected EconomicMapStorage switchToEconomicMap(HashingStorage storage) {

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

@@ -206,20 +206,6 @@ 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) {