[Truffle] Add test_benchmark.rb to the test index.

jruby · May 9, 2015 · 2c9857e · 2c9857e
1 parent c557db0
commit 2c9857e
Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/test/mri/excludes_truffle/TestBenchmark.rb b/test/mri/excludes_truffle/TestBenchmark.rb
@@ -0,0 +1 @@
+exclude :test_tms_outputs_nicely, "needs investigation"
diff --git a/test/mri_truffle.index b/test/mri_truffle.index
@@ -1,6 +1,6 @@
 # Test index
 base64/test_base64.rb
-# benchmark/test_benchmark.rb # passes alone but not in suite
+benchmark/test_benchmark.rb
 # bigdecimal/test_bigdecimal.rb
 # bigdecimal/test_bigdecimal_util.rb
 # bigdecimal/test_bigmath.rb

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
@@ -919,7 +919,7 @@ public Object stringPreviousByteIndex(RubyString string, int index) {
 
     }
 
-    @RubiniusPrimitive(name = "string_copy_from", needsSelf = false)
+    @RubiniusPrimitive(name = "string_copy_from", needsSelf = false, lowerFixnumParameters = {3, 4, 5})
     public static abstract class StringCopyFromPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringCopyFromPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -1037,7 +1037,7 @@ public Object stringRindex(RubyString string, RubyString pattern, int start) {
 
     }
 
-    @RubiniusPrimitive(name = "string_pattern")
+    @RubiniusPrimitive(name = "string_pattern", lowerFixnumParameters = {0, 1})
     public static abstract class StringPatternPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringPatternPrimitiveNode(RubyContext context, SourceSection sourceSection) {

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -631,6 +631,10 @@ public static double toDouble(Object value) {
             return (int) value;
         }
 
+        if (value instanceof Long) {
+            return (long) value;
+        }
+
         if (value instanceof RubyBignum) {
             return ((RubyBignum) value).bigIntegerValue().doubleValue();
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		exclude :test_tms_outputs_nicely, "needs investigation"