Merge branch 'master' into truffle-io

Author: chrisseaton

test/mri/excludes_truffle/TestFixnum.rb

@@ -2,3 +2,5 @@
 exclude :test_pow2, "needs investigation"
 exclude :test_power_of_0, "needs investigation"
 exclude :test_remainder, "needs investigation"
+exclude :test_xor_with_nonintegral_numeric, "needs investigation"
+exclude :test_xor_with_rational, "needs investigation"

test/mri_truffle.index

@@ -250,7 +250,7 @@ test_delegate.rb
 # test_ipaddr.rb # cannot load such file -- ipaddr
 test_open3.rb
 test_pp.rb
-# test_prettyprint.rb # passes alone but not in suite, Integer.down_to int long proc
+test_prettyprint.rb
 test_prime.rb
 # test_pstore.rb
 # test_pty.rb

truffle/src/main/java/org/jruby/truffle/nodes/core/IntegerNodes.java

@@ -77,6 +77,49 @@ public Object downto(VirtualFrame frame, int from, int to, RubyProc block) {
             return nil();
         }
 
+        @Specialization
+        public Object downto(VirtualFrame frame, long from, int to, RubyProc block) {
+            return downto(frame, from, (long) to, block);
+        }
+
+        @Specialization
+        public Object downto(VirtualFrame frame, int from, long to, RubyProc block) {
+            return downto(frame, (long) from, to, block);
+        }
+
+        @Specialization
+        public Object downto(VirtualFrame frame, long from, long to, RubyProc block) {
+            // TODO BJF 22-Apr-2015 how to handle reportLoopCount(long)
+            int count = 0;
+
+            try {
+                outer:
+                for (long i = from; i >= to; i--) {
+                    while (true) {
+                        if (CompilerDirectives.inInterpreter()) {
+                            count++;
+                        }
+
+                        try {
+                            yield(frame, block, i);
+                            continue outer;
+                        } catch (NextException e) {
+                            nextProfile.enter();
+                            continue outer;
+                        } catch (RedoException e) {
+                            redoProfile.enter();
+                        }
+                    }
+                }
+            } finally {
+                if (CompilerDirectives.inInterpreter()) {
+                    getRootNode().reportLoopCount(count);
+                }
+            }
+
+            return nil();
+        }
+
         @Specialization
         public Object downto(VirtualFrame frame, int from, double to, RubyProc block) {
             notDesignedForCompilation();