jruby · Mar 7, 2015 · Mar 7, 2015
Showing with 7 additions and 10 deletions.

+0 −1 spec/truffle/tags/core/hash/store_tags.txt

+0 −8 spec/truffle/tags/core/hash/try_convert_tags.txt

+1 −1 truffle/src/main/java/org/jruby/truffle/nodes/hash/FindEntryNode.java

+6 −0 truffle/src/main/ruby/core/rubinius/common/hash.rb
diff --git a/spec/truffle/tags/core/hash/store_tags.txt b/spec/truffle/tags/core/hash/store_tags.txt
@@ -1,2 +1 @@
-fails:Hash#store accepts keys with private #hash method
 fails:Hash#store doesn't duplicate and freeze already frozen string keys
diff --git a/spec/truffle/tags/core/hash/try_convert_tags.txt b/spec/truffle/tags/core/hash/try_convert_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/hash/FindEntryNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/hash/FindEntryNode.java
@@ -31,7 +31,7 @@ public class FindEntryNode extends RubyNode {
 
     public FindEntryNode(RubyContext context, SourceSection sourceSection) {
         super(context, sourceSection);
-        hashNode = DispatchHeadNodeFactory.createMethodCall(context);
+        hashNode = DispatchHeadNodeFactory.createMethodCall(context, true);
         eqlNode = DispatchHeadNodeFactory.createMethodCall(context, false, false, null);
         equalNode = DispatchHeadNodeFactory.createMethodCall(context, false, false, null);
     }

diff --git a/truffle/src/main/ruby/core/rubinius/common/hash.rb b/truffle/src/main/ruby/core/rubinius/common/hash.rb
@@ -230,4 +230,10 @@ def values_at(*args)
   alias_method :indices, :values_at
   alias_method :indexes, :values_at
 
+  def self.try_convert(obj)
+    Rubinius::Type.try_convert obj, Hash, :to_hash
+  end
+
+  alias_method :store, :[]=
+
 end
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Hash#store accepts keys with private #hash method
		fails:Hash#store doesn't duplicate and freeze already frozen string keys