rubinius · Feb 12, 2016 · Feb 12, 2016 · Apr 6, 2016 · Apr 6, 2016 · Apr 6, 2016
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,7 +16,7 @@ GEM
       rubinius-toolset (~> 3)
     rubinius-compiler (3.1)
     rubinius-instructions (3.0)
-    rubinius-melbourne (3.4)
+    rubinius-melbourne (3.5)
     rubinius-processor (3.0)
     rubinius-toolset (3.0)
 

diff --git a/gems_list.txt b/gems_list.txt
@@ -17,7 +17,7 @@ rubinius-coverage-2.0.3.gem
 rubinius-debugger-2.4.gem
 rubinius-developer_tools-2.0.0.gem
 rubinius-instructions-3.0.gem
-rubinius-melbourne-3.4.gem
+rubinius-melbourne-3.5.gem
 rubinius-processor-3.0.gem
 rubinius-profiler-2.0.2.gem
 rubinius-toolset-3.0.gem

diff --git a/machine/instructions.def b/machine/instructions.def
@@ -2242,8 +2242,13 @@ instruction zsuper(literal) [ block -- value ]
     }
   }
 
-  Tuple* tup = Tuple::create(state, arg_count);
+  native_int keywords_position, placeholder_position;
+  if(mc->keywords) {
+    placeholder_position = splat_obj ? mc->total_args : mc->total_args - 1;
+    keywords_position = placeholder_position + 1;
+  }
 
+  Tuple* tup = Tuple::create(state, arg_count);
   for(int i = 0; i < mc->total_args; i++) {
     tup->put(state, i, scope->get_local(state, i));
   }
@@ -2256,6 +2261,18 @@ instruction zsuper(literal) [ block -- value ]
     tup->put(state, mc->total_args, splat_obj);
   }
 
+  if(mc->keywords) {
+    Object* placeholder = scope->get_local(state, placeholder_position);
+    Array* ary = Array::create(state, 2);
+
+    for(native_int i = keywords_position; i <= mc->keywords_count; i++) {
+      ary->set(state, 0, as<Symbol>(call_frame->compiled_code->local_names()->at(state, i)));
+      ary->set(state, 1, scope->get_local(state, i));
+
+      placeholder->send(state, state->symbol("[]="), ary);
+    }
+  }
+
   CallSite* call_site = reinterpret_cast<CallSite*>(literal);
 
   Arguments new_args(call_site->name(), recv, block, arg_count, 0);

diff --git a/machine/machine_code.cpp b/machine/machine_code.cpp
@@ -82,6 +82,10 @@ namespace rubinius {
       run = MachineCode::tooling_interpreter;
     }
 
+    if(keywords) {
+      keywords_count = code->keywords()->num_fields() / 2;
+    }
+
     opcodes = new opcode[total];
 
     fill_opcodes(state, code);

diff --git a/machine/machine_code.hpp b/machine/machine_code.hpp
@@ -66,6 +66,7 @@ namespace rubinius {
     native_int required_args;
     native_int post_args;
     native_int splat_position;
+    native_int keywords_count;
 
     native_int stack_size;
     native_int number_of_locals;

diff --git a/spec/jit/method_spec.rb b/spec/jit/method_spec.rb
@@ -155,5 +155,29 @@ def m(a=1, **kw) [a, kw] end
         end
       end
     end
+
+    context "to m(a:, b: 'b', **) super end" do
+      before :each do
+        parent = Class.new do
+          def m(**args) args end
+        end
+
+        child = Class.new(parent) do
+          def m(a:, b: 'b', **) super end
+        end
+
+        @o = child.new
+
+        jit(@o, :m) { @o.m(a: "a", c: "c") }
+      end
+
+      it "compiles" do
+        @o.method(:m).executable.jitted?.should be_true
+      end
+
+      it "returns all keyword arguments passed including default ones" do
+        @o.m(a: "a", c: "c").should == {a: "a", b: "b", c: "c"}
+      end
+    end
   end
 end
diff --git a/spec/tags/jit/method_tags.txt b/spec/tags/jit/method_tags.txt
@@ -1,2 +1,3 @@
 fails:JIT compiling a method call to m(a: 0) compiles
 fails:JIT compiling a method call to m(a=1, **kw) compiles
+fails:JIT compiling a method call to m(a:, b: 'b', **) super end compiles
diff --git a/spec/tags/ruby/language/super_tags.txt b/spec/tags/ruby/language/super_tags.txt
@@ -1,4 +1,2 @@
 fails:The super keyword raises a RuntimeError when called with implicit arguments from a method defined with define_method
 fails:The super keyword invokes methods from a chain of anonymous modules
-fails:The super keyword when using keyword arguments does not pass any keyword arguments to the parent when none are given
-fails:The super keyword when using keyword arguments passes any given keyword arguments including optional and required ones to the parent