Fix: pattern matching with dynamic attribute

Author: steve-s

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -106,3 +106,20 @@ def star_match(x):
 
     assert star_match(d) == {33:33}
 
+def test_mutable_dict_keys():
+    class MyObj:
+        pass
+
+    def forward(**kwargs):
+        return kwargs
+
+    def test(name):
+        to_match = {'attr1': 1, 'attr2': 2, 'attr3': 3}
+        x = MyObj()
+        x.myattr = name
+        match to_match:
+            case {x.myattr: dyn_match, **data}:
+                return forward(dyn_match=dyn_match, **data)
+
+    assert test('attr1') == {'dyn_match': 1, 'attr2': 2, 'attr3': 3}
+    assert test('attr2') == {'dyn_match': 2, 'attr1': 1, 'attr3': 3}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/CopyDictWithoutKeysNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -47,31 +47,33 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.GenerateInline;
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 
+@GenerateInline(false) // used in BCI root node
 public abstract class CopyDictWithoutKeysNode extends PNodeWithContext {
     public abstract PDict execute(Frame frame, Object subject, Object[] keys);
 
-    @Specialization(guards = "keysArg.length <= 32")
-    static PDict copy(VirtualFrame frame, Object subject, @NeverDefault @SuppressWarnings("unused") Object[] keysArg,
-                    @Cached(value = "keysArg", dimensions = 1) Object[] keys,
+    @Specialization(guards = {"keys.length == keysLength", "keysLength <= 32"}, limit = "1")
+    static PDict copy(VirtualFrame frame, Object subject, @NeverDefault @SuppressWarnings("unused") Object[] keys,
+                    @Cached("keys.length") int keysLength,
                     @Cached PythonObjectFactory factory,
                     @Cached DictNodes.UpdateNode updateNode,
                     @Cached DictBuiltins.DelItemNode delItemNode) {
         PDict rest = factory.createDict();
         updateNode.execute(frame, rest, subject);
-        deleteKeys(frame, keys, delItemNode, rest);
+        deleteKeys(frame, keys, keysLength, delItemNode, rest);
         return rest;
     }
 
     @ExplodeLoop
-    private static void deleteKeys(VirtualFrame frame, Object[] keys, DictBuiltins.DelItemNode delItemNode, PDict rest) {
-        CompilerAsserts.partialEvaluationConstant(keys);
-        for (int i = 0; i < keys.length; i++) {
+    private static void deleteKeys(VirtualFrame frame, Object[] keys, int keysLen, DictBuiltins.DelItemNode delItemNode, PDict rest) {
+        CompilerAsserts.partialEvaluationConstant(keysLen);
+        for (int i = 0; i < keysLen; i++) {
             delItemNode.execute(frame, rest, keys[i]);
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/bytecode/MatchKeysNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -62,27 +62,24 @@
 public abstract class MatchKeysNode extends PNodeWithContext {
     public abstract Object execute(Frame frame, Object map, Object[] keys);
 
-    @Specialization(guards = {"keys.length > 0", "keys.length <= 32"})
-    static Object match(VirtualFrame frame, Object map, @NeverDefault Object[] keysArg,
-                    @Cached(value = "keysArg", dimensions = 1) Object[] keys,
+    @Specialization(guards = {"keys.length == keysLen", "keysLen > 0", "keysLen <= 32"}, limit = "1")
+    static Object matchCached(VirtualFrame frame, Object map, @NeverDefault Object[] keys,
+                    @Cached("keys.length") int keysLen,
                     @Cached PyObjectRichCompareBool.EqNode compareNode,
                     @Cached PyObjectCallMethodObjArgs callMethod,
                     @Cached PythonObjectFactory factory,
                     @Cached PRaiseNode raise) {
-        if (keys.length == 0) {
-            return factory.createTuple(PythonUtils.EMPTY_OBJECT_ARRAY);
-        }
-        Object[] values = getValues(frame, map, keys, compareNode, callMethod, raise);
+        Object[] values = getValues(frame, map, keys, keysLen, compareNode, callMethod, raise);
         return values != null ? factory.createTuple(values) : PNone.NONE;
     }
 
     @ExplodeLoop
-    private static Object[] getValues(VirtualFrame frame, Object map, Object[] keys, PyObjectRichCompareBool.EqNode compareNode, PyObjectCallMethodObjArgs callMethod, PRaiseNode raise) {
-        CompilerAsserts.partialEvaluationConstant(keys);
-        Object[] values = new Object[keys.length];
+    private static Object[] getValues(VirtualFrame frame, Object map, Object[] keys, int keysLen, PyObjectRichCompareBool.EqNode compareNode, PyObjectCallMethodObjArgs callMethod, PRaiseNode raise) {
+        CompilerAsserts.partialEvaluationConstant(keysLen);
+        Object[] values = new Object[keysLen];
         Object dummy = new Object();
-        Object[] seen = new Object[keys.length];
-        for (int i = 0; i < keys.length; i++) {
+        Object[] seen = new Object[keysLen];
+        for (int i = 0; i < values.length; i++) {
             Object key = keys[i];
             checkSeen(frame, raise, seen, key, compareNode);
             seen[i] = key;
@@ -104,7 +101,7 @@ private static void checkSeen(VirtualFrame frame, PRaiseNode raise, Object[] see
         }
     }
 
-    @Specialization(guards = "keys.length > 32")
+    @Specialization(guards = "keys.length > 0", replaces = "matchCached")
     static Object match(VirtualFrame frame, Object map, Object[] keys,
                     @Cached PyObjectRichCompareBool.EqNode compareNode,
                     @Cached PyObjectCallMethodObjArgs callMethod,
@@ -118,7 +115,6 @@ static Object match(VirtualFrame frame, Object map, Object[] keys,
     }
 
     private static Object[] getValuesLongArray(VirtualFrame frame, Object map, Object[] keys, PyObjectRichCompareBool.EqNode compareNode, PyObjectCallMethodObjArgs callMethod, PRaiseNode raise) {
-        CompilerAsserts.partialEvaluationConstant(keys);
         Object[] values = new Object[keys.length];
         Object dummy = new Object();
         Object[] seen = new Object[keys.length];