Better fix for #3094: just reset opt arg when it is undefined.

jruby · Mar 7, 2016 · 2991a3b · 2991a3b
1 parent 0d2ea26
commit 2991a3b
Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -1923,12 +1923,12 @@ protected void receiveNonBlockArgs(final ArgsNode argsNode) {
                 if (scope instanceof IRMethod) addArgumentDescription(ArgumentType.opt, argName);
                 Variable temp = createTemporaryVariable();
                 // You need at least required+j+1 incoming args for this opt arg to get an arg at all
-                addInstr(new ReceiveOptArgInstr(temp, signature.required(), signature.pre(), j));
-                addInstr(BNEInstr.create(l, temp, UndefinedValue.UNDEFINED)); // if 'av' is not undefined, go to default
+                addInstr(new ReceiveOptArgInstr(av, signature.required(), signature.pre(), j));
+                addInstr(BNEInstr.create(l, av, UndefinedValue.UNDEFINED)); // if 'av' is not undefined, go to default
+                addInstr(new CopyInstr(av, buildNil())); // wipe out undefined value with nil
                 Operand defaultResult = build(n.getValue());
-                addInstr(new CopyInstr(temp, defaultResult));
+                addInstr(new CopyInstr(av, defaultResult));
                 addInstr(new LabelInstr(l));
-                addInstr(new CopyInstr(av, temp));
             }
         }
 
@@ -2024,6 +2024,7 @@ public void receiveArgs(final ArgsNode argsNode) {
 
                 // Required kwargs have no value and check_arity will throw if they are not provided.
                 if (!isRequiredKeywordArgumentValue(kasgn)) {
+                    addInstr(new CopyInstr(av, buildNil())); // wipe out undefined value with nil
                     build(kasgn);
                 } else {
                     addInstr(new RaiseRequiredKeywordArgumentError(argName));

diff --git a/spec/compiler/general_spec.rb b/spec/compiler/general_spec.rb
@@ -1080,6 +1080,30 @@ def a; __callee__; end
         run('def foo; yield; end; foo {|a = a, b = b, c = c|; [a.inspect, b.inspect, c.inspect]}') do |x|
           expect(x).to eq(["nil", "nil", "nil"])
         end
+
+        run('def foo(a: a, b: b, c: c); [a.inspect, b.inspect, c.inspect]; end; foo') do |x|
+          expect(x).to eq(["nil", "nil", "nil"])
+        end
+        run('def foo; yield; end; foo {|a: a, b: b, c: c|; [a.inspect, b.inspect, c.inspect]}') do |x|
+          expect(x).to eq(["nil", "nil", "nil"])
+        end
+      ensure
+        $VERBOSE = verbose
+      end
+    end
+
+    it "combines optional args and zsuper properly" do
+      begin
+        verbose = $VERBOSE
+        $VERBOSE = nil
+
+        run('class OptZSuperA; def foo(a, b); [a, b]; end; end; class OptZSuperB < OptZSuperA; def foo(a = "", b = nil); super; end; end; OptZSuperB.new.foo') do |x|
+          expect(x).to eq(["", nil])
+        end
+
+        run('class OptZSuperA; def foo(a:, b:); [a, b]; end; end; class OptZSuperB < OptZSuperA; def foo(a: "", b: nil); super; end; end; OptZSuperB.new.foo') do |x|
+          expect(x).to eq(["", nil])
+        end
       ensure
         $VERBOSE = verbose
       end