Merge pull request #8436 from headius/enumerable_fixes

headius · web-flow · commit 2f915ca63dfc · 2025-01-15T12:34:54.000-06:00
Pass Enumerable#uniq arguments properly
diff --git a/core/src/main/java/org/jruby/RubyEnumerable.java b/core/src/main/java/org/jruby/RubyEnumerable.java
@@ -2141,7 +2141,19 @@ public static IRubyObject uniq(ThreadContext context, IRubyObject self, final Bl
         if (block.isGiven()) {
             callEach(context, each, self, Signature.OPTIONAL, new BlockCallback() {
                 public IRubyObject call(ThreadContext ctx, IRubyObject[] largs, Block blk) {
-                    return call(ctx, packEnumValues(ctx, largs), blk);
+                    final IRubyObject obj; boolean ary = false;
+                    switch (largs.length) {
+                        case 0:  obj = ctx.nil; break;
+                        case 1:  obj = largs[0]; break;
+                        default: obj = RubyArray.newArrayMayCopy(ctx.runtime, largs); ary = true;
+                    }
+
+                    IRubyObject key = ary ? block.yieldArray(ctx, obj, null) : block.yield(ctx, obj);
+
+                    if (hash.getEntry(key) == RubyHash.NO_ENTRY) {
+                        hash.internalPut(key, obj);
+                    }
+                    return obj;
                 }
                 @Override
                 public IRubyObject call(ThreadContext ctx, IRubyObject obj, Block blk) {
