[Truffle] Fix wrong lowering indices in StringPrimitiveNodes.

* Other lowerFixnumParameters seem good for @RubiniusPrimitive.
jruby · Sep 29, 2015 · 82dc923 · 82dc923
1 parent 5e0eece
commit 82dc923
Showing 1 changed file with 9 additions and 9 deletions.
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
@@ -342,7 +342,7 @@ public DynamicObject stringCheckNullSafe(DynamicObject string) {
 
     }
 
-    @RubiniusPrimitive(name = "string_chr_at", lowerFixnumParameters = 1)
+    @RubiniusPrimitive(name = "string_chr_at", lowerFixnumParameters = 0)
     public static abstract class StringChrAtPrimitiveNode extends RubiniusPrimitiveNode {
 
         @Child private StringByteSubstringPrimitiveNode stringByteSubstringNode;
@@ -655,7 +655,7 @@ public Object stringIndex(VirtualFrame frame, DynamicObject string, DynamicObjec
 
     }
 
-    @RubiniusPrimitive(name = "string_character_byte_index", needsSelf = false, lowerFixnumParameters = {1, 2})
+    @RubiniusPrimitive(name = "string_character_byte_index", needsSelf = false, lowerFixnumParameters = { 0, 1 })
     @ImportStatic(StringGuards.class)
     public static abstract class CharacterByteIndexNode extends RubiniusPrimitiveNode {
 
@@ -729,7 +729,7 @@ public int stringByteCharacterIndex(DynamicObject string, int index, int start)
         }
     }
 
-    @RubiniusPrimitive(name = "string_character_index", needsSelf = false, lowerFixnumParameters = 2)
+    @RubiniusPrimitive(name = "string_character_index", needsSelf = false, lowerFixnumParameters = 1)
     public static abstract class StringCharacterIndexPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringCharacterIndexPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -829,7 +829,7 @@ public Object stringCharacterIndex(DynamicObject string, DynamicObject pattern,
 
     }
 
-    @RubiniusPrimitive(name = "string_byte_index", needsSelf = false, lowerFixnumParameters = {1, 2})
+    @RubiniusPrimitive(name = "string_byte_index", needsSelf = false, lowerFixnumParameters = { 0, 1 })
     public static abstract class StringByteIndexPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringByteIndexPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -956,7 +956,7 @@ public Object stringPreviousByteIndex(DynamicObject string, int index) {
 
     }
 
-    @RubiniusPrimitive(name = "string_copy_from", needsSelf = false, lowerFixnumParameters = {2, 3, 4})
+    @RubiniusPrimitive(name = "string_copy_from", needsSelf = false, lowerFixnumParameters = { 1, 2, 3 })
     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 = 1)
+    @RubiniusPrimitive(name = "string_resize_capacity", needsSelf = false, lowerFixnumParameters = 0)
     public static abstract class StringResizeCapacityPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringResizeCapacityPrimitiveNode(RubyContext context, SourceSection sourceSection) {
@@ -1076,7 +1076,7 @@ public Object stringRindex(DynamicObject string, DynamicObject pattern, int star
 
     }
 
-    @RubiniusPrimitive(name = "string_pattern", lowerFixnumParameters = {0, 1})
+    @RubiniusPrimitive(name = "string_pattern", lowerFixnumParameters = { 0, 1 })
     public static abstract class StringPatternPrimitiveNode extends RubiniusPrimitiveNode {
 
         @Child private AllocateObjectNode allocateObjectNode;
@@ -1154,7 +1154,7 @@ public DynamicObject stringByteAppend(DynamicObject string, DynamicObject other)
 
     }
 
-    @RubiniusPrimitive(name = "string_substring", lowerFixnumParameters = { 1, 2 })
+    @RubiniusPrimitive(name = "string_substring", lowerFixnumParameters = { 0, 1 })
     @ImportStatic(StringGuards.class)
     public static abstract class StringSubstringPrimitiveNode extends RubiniusPrimitiveNode {
 
@@ -1294,7 +1294,7 @@ private DynamicObject makeSubstring(DynamicObject string, int beg, int len) {
 
     }
 
-    @RubiniusPrimitive(name = "string_from_bytearray", needsSelf = false, lowerFixnumParameters = {1, 2})
+    @RubiniusPrimitive(name = "string_from_bytearray", needsSelf = false, lowerFixnumParameters = { 0, 1 })
     public static abstract class StringFromByteArrayPrimitiveNode extends RubiniusPrimitiveNode {
 
         public StringFromByteArrayPrimitiveNode(RubyContext context, SourceSection sourceSection) {