jruby · Oct 2, 2014 · Oct 2, 2014
Showing with 14 additions and 2 deletions.

+13 −0 core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java

+1 −1 core/src/main/java/org/jruby/truffle/runtime/RubyCallStack.java

+0 −1 spec/truffle/tags/language/return_tags.txt
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
@@ -1480,6 +1480,19 @@ public Object times(VirtualFrame frame, int n, RubyProc block) {
             return n;
         }
 
+        @Specialization
+        public RubyArray times(VirtualFrame frame, int n, UndefinedPlaceholder block) {
+            notDesignedForCompilation();
+
+            final int[] array = new int[n];
+
+            for (int i = 0; i < n; i++) {
+                array[i] = i;
+            }
+
+            return new RubyArray(getContext().getCoreLibrary().getArrayClass(), array, n);
+        }
+
         @Specialization
         public Object times(VirtualFrame frame, long n, RubyProc block) {
             int count = 0;

diff --git a/core/src/main/java/org/jruby/truffle/runtime/RubyCallStack.java b/core/src/main/java/org/jruby/truffle/runtime/RubyCallStack.java
@@ -114,7 +114,7 @@ public static Backtrace getBacktrace(Node currentNode) {
              * features beyond what MRI does like printing locals in backtraces.
              */
 
-            if (currentNode != null) {
+            if (currentNode != null && Truffle.getRuntime().getCurrentFrame() != null) {
                 activations.add(new Activation(currentNode, Truffle.getRuntime().getCurrentFrame().getFrame(FrameInstance.FrameAccess.MATERIALIZE, true).materialize()));
             }
 

diff --git a/spec/truffle/tags/language/return_tags.txt b/spec/truffle/tags/language/return_tags.txt
@@ -1,2 +1 @@
-fails:The return keyword in a Thread raises a LocalJumpError if used to exit a thread
 fails:The return keyword within define_method stops at the method when the return is used directly
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:The return keyword in a Thread raises a LocalJumpError if used to exit a thread
		fails:The return keyword within define_method stops at the method when the return is used directly