jruby · Jun 22, 2015 · Jun 22, 2015 · Jun 22, 2015
diff --git a/spec/truffle/tags/core/env/element_set_tags.txt b/spec/truffle/tags/core/env/element_set_tags.txt
diff --git a/spec/truffle/tags/core/env/reject_tags.txt b/spec/truffle/tags/core/env/reject_tags.txt
diff --git a/spec/truffle/tags/core/env/store_tags.txt b/spec/truffle/tags/core/env/store_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ExceptionPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/ExceptionPrimitiveNodes.java
@@ -33,9 +33,10 @@ public static abstract class ExceptionErrnoErrorPrimitiveNode extends RubiniusPr
         protected final static int EACCES = Errno.EACCES.intValue();
         protected final static int EFAULT = Errno.EFAULT.intValue();
         protected final static int ENOTDIR = Errno.ENOTDIR.intValue();
+        protected final static int EINVAL = Errno.EINVAL.intValue();
 
         public static boolean isExceptionSupported(int errno) {
-            return errno == EPERM || errno == ENOENT || errno == EBADF || errno == EEXIST || errno == EACCES || errno == EFAULT || errno == ENOTDIR;
+            return errno == EPERM || errno == ENOENT || errno == EBADF || errno == EEXIST || errno == EACCES || errno == EFAULT || errno == ENOTDIR || errno == EINVAL;
         }
 
         public ExceptionErrnoErrorPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -102,6 +103,11 @@ public RubyException enotdir(RubyString message, int errno) {
             return getContext().getCoreLibrary().notDirectoryError(message.toString(), this);
         }
 
+        @Specialization(guards = "errno == EINVAL")
+        public RubyException einval(RubyString message, int errno) {
+            return getContext().getCoreLibrary().errnoError(errno, this);
+        }
+
         @TruffleBoundary
         @Specialization(guards = "!isExceptionSupported(errno)")
         public RubyException unsupported(Object message, int errno) {

diff --git a/truffle/src/main/ruby/core/hash.rb b/truffle/src/main/ruby/core/hash.rb
@@ -61,7 +61,7 @@ def merge_fallback(other, &block)
   # Rubinius' Hash#reject taints but we don't want this
 
   def reject(&block)
-    return to_enum(:reject) unless block_given?
+    return to_enum(:reject) { size } unless block_given?
     copy = dup
     copy.untaint
     copy.delete_if(&block)