[GR-17332] Dict contains returns false in case of wrapped PString types

PullRequest: graalpython/595

Author: Franziska Geiger

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

@@ -457,3 +457,39 @@ 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

@@ -85,6 +85,7 @@
 import com.oracle.graal.python.nodes.PNodeWithGlobalState.DefaultContextManager;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
+import com.oracle.graal.python.nodes.attributes.LookupAttributeInMRONode;
 import com.oracle.graal.python.nodes.attributes.LookupInheritedAttributeNode;
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
 import com.oracle.graal.python.nodes.builtins.ListNodes.FastConstructListNode;
@@ -591,6 +592,19 @@ protected boolean readUncached(VirtualFrame frame, PythonObjectHybridDictStorage
         }
 
         @Specialization(guards = "!isJavaString(name)")
+        protected boolean readUncached(VirtualFrame frame, DynamicObjectStorage storage, PString name,
+                        @Cached LookupInheritedAttributeNode.Dynamic lookupHash,
+                        @Cached LookupAttributeInMRONode.Dynamic lookupStringHash,
+                        @Cached ContainsKeyNode recursiveNode) {
+            if (lookupHash.execute(name, __HASH__) == lookupStringHash.execute(PythonBuiltinClassType.PString, __HASH__)) {
+                return recursiveNode.execute(frame, storage, name.getValue());
+            }
+            CompilerDirectives.transferToInterpreter();
+            // see GR-17389
+            throw new RuntimeException("String subclasses with custom hash in dict not implemented.");
+        }
+
+        @Specialization(guards = {"!isJavaString(name)", "!isPString(name)"})
         @SuppressWarnings("unused")
         protected boolean readUncached(DynamicObjectStorage storage, Object name) {
             return false;