Fix checking pattern constant on the object and not on the deconstructed value

Author: eregon

src/main/java/org/truffleruby/parser/YARPPatternMatchingTranslator.java

@@ -94,6 +94,13 @@ public RubyNode visitCapturePatternNode(Nodes.CapturePatternNode node) {
 
     @Override
     public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
+        RubyNode condition;
+        if (node.constant != null) { // Constant[a]
+            condition = matchValue(node.constant);
+        } else {
+            condition = null;
+        }
+
         var preNodes = node.requireds;
         var restNode = node.rest;
         var postNodes = node.posts;
@@ -110,10 +117,13 @@ public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
         RubyNode outerPrev = currentValueToMatch;
         currentValueToMatch = readTemp;
         try {
-            RubyNode condition = ArrayPatternLengthCheckNodeGen.create(preSize + postSize, restNode != null, readTemp);
-
-            if (node.constant != null) { // Constant[a]
-                condition = AndNodeGen.create(matchValue(node.constant), condition);
+            RubyNode check = YARPTranslator.sequence(Arrays.asList(
+                    assignTemp,
+                    ArrayPatternLengthCheckNodeGen.create(preSize + postSize, restNode != null, readTemp)));
+            if (condition == null) {
+                condition = check;
+            } else {
+                condition = AndNodeGen.create(condition, check);
             }
 
             for (int i = 0; i < preNodes.length; i++) {
@@ -160,15 +170,21 @@ public RubyNode visitArrayPatternNode(Nodes.ArrayPatternNode node) {
                 }
             }
 
-            RubyNode ret = YARPTranslator.sequence(Arrays.asList(assignTemp, condition));
-            return assignPositionAndFlags(node, ret);
+            return assignPositionAndFlags(node, condition);
         } finally {
             currentValueToMatch = outerPrev;
         }
     }
 
     @Override
     public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
+        RubyNode condition;
+        if (node.constant != null) { // Constant(a: 0)
+            condition = matchValue(node.constant);
+        } else {
+            condition = null;
+        }
+
         Nodes.Node[] pairs = node.elements;
         RubySymbol[] keys = new RubySymbol[pairs.length];
         for (int i = 0; i < pairs.length; i++) {
@@ -200,11 +216,13 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
         RubyNode outerPrev = currentValueToMatch;
         currentValueToMatch = readTemp;
         try {
-
-            RubyNode condition = HashPatternLengthCheckNodeGen.create(node.elements.length, readTemp);
-
-            if (node.constant != null) { // Constant[a: 0]
-                condition = AndNodeGen.create(matchValue(node.constant), condition);
+            RubyNode check = YARPTranslator.sequence(Arrays.asList(
+                    assignTemp,
+                    HashPatternLengthCheckNodeGen.create(node.elements.length, readTemp)));
+            if (condition == null) {
+                condition = check;
+            } else {
+                condition = AndNodeGen.create(condition, check);
             }
 
             for (int i = 0; i < pairs.length; i++) {
@@ -220,10 +238,10 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
                 RubyNode prev = currentValueToMatch;
                 currentValueToMatch = readValue;
                 try {
-                    RubyNode check = YARPTranslator.sequence(assocNode, Arrays.asList(
+                    RubyNode valueCondition = YARPTranslator.sequence(assocNode, Arrays.asList(
                             writeValue,
                             AndNodeGen.create(new IsNotUndefinedNode(readValue), assocNode.value.accept(this))));
-                    condition = AndNodeGen.create(condition, check);
+                    condition = AndNodeGen.create(condition, valueCondition);
                 } finally {
                     currentValueToMatch = prev;
                 }
@@ -251,8 +269,7 @@ public RubyNode visitHashPatternNode(Nodes.HashPatternNode node) {
                 }
             }
 
-            RubyNode ret = YARPTranslator.sequence(Arrays.asList(assignTemp, condition));
-            return assignPositionAndFlags(node, ret);
+            return assignPositionAndFlags(node, condition);
         } finally {
             currentValueToMatch = outerPrev;
         }

test/mri/excludes/TestPatternMatching.rb

@@ -1,4 +1,5 @@
 exclude :test_alternative_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:204:in `test_alternative_pattern'."
+exclude :test_hash_pattern, "Failed assertion, no message given."
 exclude :test_invalid_syntax, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1269:in `test_invalid_syntax'."
 exclude :test_literal_value_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:347:in `test_literal_value_pattern'."
 exclude :test_single_pattern_error_alternative_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
@@ -8,8 +9,6 @@
 exclude :test_single_pattern_error_hash_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_single_pattern_error_value_pattern, "Expected Exception(NoMatchingPatternError) was raised, but the message doesn't match."
 exclude :test_var_pattern, "/home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:243:in `test_var_pattern'."
-exclude :test_array_pattern, "NoMatchingPatternError: #<TestPatternMatching::C:0x578 @obj=[0]>"
 exclude :test_deconstruct_cache, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1451"
 exclude :test_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806: YARPDefNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:806"
-exclude :test_hash_pattern, "NoMatchingPatternError: #<TestPatternMatching::C:0x778 @obj={:a=>0}>"
 exclude :test_single_pattern_error_find_pattern, "SyntaxError: /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623: YARPBlockNodeTranslator does not know how to translate FindPatternNode at /home/eregon/code/truffleruby-ws/truffleruby/test/mri/tests/ruby/test_pattern_matching.rb:1623"