[Truffle] Added a new node for getting a byte from a rope.

nirvdrum · nirvdrum · commit 00345044892c · 2016-03-28T11:23:49.000-04:00
diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeNodes.java
@@ -627,4 +627,30 @@ protected int getCacheLimit() {
         }
 
     }
+
+    @NodeChildren({
+            @NodeChild(type = RubyNode.class, value = "rope"),
+            @NodeChild(type = RubyNode.class, value = "index")
+    })
+    public abstract static class GetByteNode extends RubyNode {
+
+        public GetByteNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public abstract int executeGetByte(Rope rope, int index);
+
+        @Specialization(guards = "rope.getRawBytes() != null")
+        public int getByte(Rope rope, int index) {
+            return rope.getRawBytes()[index] & 0xff;
+        }
+
+        @Specialization(guards = "rope.getRawBytes() == null")
+        @TruffleBoundary
+        public int getByteSlow(Rope rope, int index) {
+            return rope.getBytes()[index] & 0xff;
+        }
+
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
@@ -1260,26 +1260,30 @@ public DynamicObject forceEncoding(VirtualFrame frame, DynamicObject string, Obj
     @CoreMethod(names = "getbyte", required = 1, lowerFixnumParameters = 0)
     public abstract static class GetByteNode extends CoreMethodArrayArgumentsNode {
 
+        @Child private RopeNodes.GetByteNode ropeGetByteNode;
+
         public GetByteNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
+            ropeGetByteNode = RopeNodesFactory.GetByteNodeGen.create(context, sourceSection, null, null);
         }
 
         @Specialization
         public Object getByte(DynamicObject string, int index,
                               @Cached("createBinaryProfile()") ConditionProfile negativeIndexProfile,
                               @Cached("createBinaryProfile()") ConditionProfile indexOutOfBoundsProfile) {
-            final byte[] bytes = rope(string).getBytes();
+            final Rope rope = rope(string);
 
             if (negativeIndexProfile.profile(index < 0)) {
-                index += bytes.length;
+                index += rope.byteLength();
             }
 
-            if (indexOutOfBoundsProfile.profile((index < 0) || (index >= bytes.length))) {
+            if (indexOutOfBoundsProfile.profile((index < 0) || (index >= rope.byteLength()))) {
                 return nil();
             }
 
-            return bytes[index] & 0xff;
+            return ropeGetByteNode.executeGetByte(rope, index);
         }
+
     }
 
     @CoreMethod(names = "hash")

Original file line number	Diff line number	Diff line change
`@@ -1260,26 +1260,30 @@ public DynamicObject forceEncoding(VirtualFrame frame, DynamicObject string, Obj`
`1260`	`1260`	`@CoreMethod(names = "getbyte", required = 1, lowerFixnumParameters = 0)`
`1261`	`1261`	`public abstract static class GetByteNode extends CoreMethodArrayArgumentsNode {`
`1262`	`1262`
	`1263`	`+ @Child private RopeNodes.GetByteNode ropeGetByteNode;`
	`1264`	`+`
`1263`	`1265`	`public GetByteNode(RubyContext context, SourceSection sourceSection) {`
`1264`	`1266`	`super(context, sourceSection);`
	`1267`	`+ ropeGetByteNode = RopeNodesFactory.GetByteNodeGen.create(context, sourceSection, null, null);`
`1265`	`1268`	`}`
`1266`	`1269`
`1267`	`1270`	`@Specialization`
`1268`	`1271`	`public Object getByte(DynamicObject string, int index,`
`1269`	`1272`	`@Cached("createBinaryProfile()") ConditionProfile negativeIndexProfile,`
`1270`	`1273`	`@Cached("createBinaryProfile()") ConditionProfile indexOutOfBoundsProfile) {`
`1271`		`- final byte[] bytes = rope(string).getBytes();`
	`1274`	`+ final Rope rope = rope(string);`
`1272`	`1275`
`1273`	`1276`	`if (negativeIndexProfile.profile(index < 0)) {`
`1274`		`- index += bytes.length;`
	`1277`	`+ index += rope.byteLength();`
`1275`	`1278`	`}`
`1276`	`1279`
`1277`		`- if (indexOutOfBoundsProfile.profile((index < 0) \|\| (index >= bytes.length))) {`
	`1280`	`+ if (indexOutOfBoundsProfile.profile((index < 0) \|\| (index >= rope.byteLength()))) {`
`1278`	`1281`	`return nil();`
`1279`	`1282`	`}`
`1280`	`1283`
`1281`		`- return bytes[index] & 0xff;`
	`1284`	`+ return ropeGetByteNode.executeGetByte(rope, index);`
`1282`	`1285`	`}`
	`1286`	`+`
`1283`	`1287`	`}`
`1284`	`1288`
`1285`	`1289`	`@CoreMethod(names = "hash")`