[Truffle] Fixed and/or added fixnum lowering where needed.

jruby · Sep 29, 2015 · 5f1f2e2 · 5f1f2e2
1 parent 82dc923
commit 5f1f2e2
Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -1156,7 +1156,7 @@ public DynamicObject forceEncoding(VirtualFrame frame, DynamicObject string, Obj
 
     }
 
-    @CoreMethod(names = "getbyte", required = 1)
+    @CoreMethod(names = "getbyte", required = 1, lowerFixnumParameters = 0)
     public abstract static class GetByteNode extends CoreMethodArrayArgumentsNode {
 
         private final ConditionProfile negativeIndexProfile = ConditionProfile.createBinaryProfile();

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
@@ -729,7 +729,7 @@ public int stringByteCharacterIndex(DynamicObject string, int index, int start)
         }
     }
 
-    @RubiniusPrimitive(name = "string_character_index", needsSelf = false, lowerFixnumParameters = 1)
+    @RubiniusPrimitive(name = "string_character_index", needsSelf = false, lowerFixnumParameters = 2)
     public static abstract class StringCharacterIndexPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringCharacterIndexPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -956,7 +956,7 @@ public Object stringPreviousByteIndex(DynamicObject string, int index) {
 
     }
 
-    @RubiniusPrimitive(name = "string_copy_from", needsSelf = false, lowerFixnumParameters = { 1, 2, 3 })
+    @RubiniusPrimitive(name = "string_copy_from", needsSelf = false, lowerFixnumParameters = { 2, 3, 4 })
     public static abstract class StringCopyFromPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringCopyFromPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -994,7 +994,7 @@ public DynamicObject stringCopyFrom(DynamicObject string, DynamicObject other, i
 
     }
 
-    @RubiniusPrimitive(name = "string_resize_capacity", needsSelf = false, lowerFixnumParameters = 0)
+    @RubiniusPrimitive(name = "string_resize_capacity", needsSelf = false, lowerFixnumParameters = 1)
     public static abstract class StringResizeCapacityPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringResizeCapacityPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -1294,7 +1294,7 @@ private DynamicObject makeSubstring(DynamicObject string, int beg, int len) {
 
     }
 
-    @RubiniusPrimitive(name = "string_from_bytearray", needsSelf = false, lowerFixnumParameters = { 0, 1 })
+    @RubiniusPrimitive(name = "string_from_bytearray", needsSelf = false, lowerFixnumParameters = { 1, 2 })
     public static abstract class StringFromByteArrayPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringFromByteArrayPrimitiveNode(RubyContext context, SourceSection sourceSection) {