[Truffle] Handle #to_hash returning nil when restructuring an array i…

…nto block keyword arguments.
jruby · Jan 11, 2016 · 2e14199 · 2e14199
1 parent b121c46
commit 2e14199
Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/spec/truffle/tags/language/block_tags.txt b/spec/truffle/tags/language/block_tags.txt
@@ -1,4 +1,3 @@
 fails:A block yielded a single Array assigns elements to required arguments when a keyword rest argument is present
-fails:A block yielded a single Array assigns the last element to a non-keyword argument if #to_hash returns nil
 fails:A block yielded a single Array calls #to_hash on the argument but does not use the result when no keywords are present
 fails:A block yielded a single Array calls #to_hash on the last element when there are more arguments than parameters
diff --git a/truffle/src/main/ruby/core/shims.rb b/truffle/src/main/ruby/core/shims.rb
@@ -276,6 +276,12 @@ def self.load_arguments_from_array_kw_helper(array, kwrest_name, binding)
 
     last_arg = array.pop
     kwargs = last_arg.to_hash
+
+    if kwargs.nil?
+      array.push last_arg
+      return array
+    end
+
     raise TypeError.new("can't convert #{last_arg.class} to Hash (#{last_arg.class}#to_hash gives #{kwargs.class})") unless kwargs.is_a?(Hash)
 
     kwargs.select! do |key, value|