jruby · Mar 3, 2015 · Mar 3, 2015
diff --git a/spec/truffle/tags/core/hash/each_key_tags.txt b/spec/truffle/tags/core/hash/each_key_tags.txt
diff --git a/spec/truffle/tags/core/hash/each_tags.txt b/spec/truffle/tags/core/hash/each_tags.txt
@@ -1,8 +1 @@
-fails:Hash#each yields a [[key, value]] Array for each pair to a block expecting |*args|
-fails:Hash#each yields the key and value of each pair to a block expecting |key, value|
-fails:Hash#each yields the key only to a block expecting |key,|
-fails:Hash#each uses the same order as keys() and values()
 fails:Hash#each properly expands (or not) child class's 'each'-yielded args
-fails:Hash#each returns an Enumerator if called on a non-empty hash without a block
-fails:Hash#each returns an Enumerator if called on an empty hash without a block
-fails:Hash#each returns an Enumerator if called on a frozen instance
diff --git a/spec/truffle/tags/core/hash/each_value_tags.txt b/spec/truffle/tags/core/hash/each_value_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/HashNodes.java
@@ -542,12 +542,15 @@ public Object delete(VirtualFrame frame, RubyHash hash, Object key) {
     @ImportGuards(HashGuards.class)
     public abstract static class EachNode extends YieldingCoreMethodNode {
 
+        @Child private CallDispatchHeadNode toEnumNode;
+
         public EachNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
         public EachNode(EachNode prev) {
             super(prev);
+            toEnumNode = prev.toEnumNode;
         }
 
         @Specialization(guards = "isNull")
@@ -597,6 +600,18 @@ public RubyHash eachBuckets(VirtualFrame frame, RubyHash hash, RubyProc block) {
             return hash;
         }
 
+        @Specialization
+        public Object each(VirtualFrame frame, RubyHash hash, UndefinedPlaceholder block) {
+            notDesignedForCompilation();
+
+            if (toEnumNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                toEnumNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), true));
+            }
+
+            return toEnumNode.call(frame, hash, "to_enum", null, getContext().getSymbolTable().getSymbol(getName()));
+        }
+
     }
 
     @CoreMethod(names = "empty?")

diff --git a/truffle/src/main/ruby/core/rubinius/common/hash.rb b/truffle/src/main/ruby/core/rubinius/common/hash.rb
@@ -57,4 +57,18 @@ def merge!(other)
 
   alias_method :update, :merge!
 
+  def each_key
+    return to_enum(:each_key) unless block_given?
+
+    each_item { |item| yield item.key }
+    self
+  end
+
+  def each_value
+    return to_enum(:each_value) unless block_given?
+
+    each_item { |item| yield item.value }
+    self
+  end
+
 end
diff --git a/truffle/src/main/ruby/core/shims.rb b/truffle/src/main/ruby/core/shims.rb
@@ -89,18 +89,6 @@ def fetch(key, default=nil)
     end
   end
 
-  def each_key
-    each do |key, value|
-      yield key
-    end
-  end
-
-  def each_value
-    each do |key, value|
-      yield value
-    end
-  end
-
   def value?(value)
     values.any? { |v| v == value }
   end