Merge pull request #7373 from headius/hash_each_lambda

headius · web-flow · commit eb13bde95214 · 2022-09-22T02:06:35.000-05:00
Always yield two-elt ary from Hash#each to lambda
diff --git a/core/src/main/java/org/jruby/RubyHash.java b/core/src/main/java/org/jruby/RubyHash.java
@@ -1564,7 +1564,9 @@ public RubyHash each_pairCommon(final ThreadContext context, final Block block)
     private static final VisitorWithState<Block> YieldKeyValueArrayVisitor = new VisitorWithState<Block>() {
         @Override
         public void visit(ThreadContext context, RubyHash self, IRubyObject key, IRubyObject value, int index, Block block) {
-            if (block.getSignature().arityValue() > 1) {
+            if (block.type == Block.Type.LAMBDA) {
+                block.call(context, context.runtime.newArray(key, value));
+            } else if (block.getSignature().arityValue() > 1) {
                 block.yieldSpecific(context, key, value);
             } else {
                 block.yield(context, context.runtime.newArray(key, value));
