Migrated profiles to inlinable in inlined package

Author: horakivo

src/main/java/org/truffleruby/core/inlined/InlinedAtNode.java

@@ -9,6 +9,9 @@
  */
 package org.truffleruby.core.inlined;
 
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayIndexNodes;
 import org.truffleruby.core.array.RubyArray;
@@ -19,7 +22,6 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public abstract class InlinedAtNode extends BinaryInlinedOperationNode {
 
@@ -33,11 +35,12 @@ public InlinedAtNode(RubyLanguage language, RubyCallNodeParameters callNodeParam
             guards = "lookupNode.lookupProtected(frame, array, METHOD) == coreMethods().ARRAY_AT",
             assumptions = "assumptions",
             limit = "1")
-    protected Object arrayAt(VirtualFrame frame, RubyArray array, int index,
+    protected static Object arrayAt(VirtualFrame frame, RubyArray array, int index,
             @Cached LookupMethodOnSelfNode lookupNode,
             @Cached ArrayIndexNodes.ReadNormalizedNode readNormalizedNode,
-            @Cached ConditionProfile denormalized) {
-        if (denormalized.profile(index < 0)) {
+            @Cached InlinedConditionProfile denormalized,
+            @Bind("this") Node node) {
+        if (denormalized.profile(node, index < 0)) {
             index += array.size;
         }
         return readNormalizedNode.executeRead(array, index);

src/main/java/org/truffleruby/core/inlined/InlinedIndexGetNode.java

@@ -9,7 +9,9 @@
  */
 package org.truffleruby.core.inlined;
 
-import com.oracle.truffle.api.profiles.ConditionProfile;
+import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayIndexNodes;
 import org.truffleruby.core.array.RubyArray;
@@ -33,11 +35,12 @@ public InlinedIndexGetNode(RubyLanguage language, RubyCallNodeParameters callNod
             guards = "lookupNode.lookupProtected(frame, array, METHOD) == coreMethods().ARRAY_INDEX_GET",
             assumptions = "assumptions",
             limit = "1")
-    protected Object arrayRead(VirtualFrame frame, RubyArray array, int index,
+    protected static Object arrayRead(VirtualFrame frame, RubyArray array, int index,
             @Cached LookupMethodOnSelfNode lookupNode,
             @Cached ArrayIndexNodes.ReadNormalizedNode readNormalizedNode,
-            @Cached ConditionProfile denormalized) {
-        if (denormalized.profile(index < 0)) {
+            @Cached InlinedConditionProfile denormalized,
+            @Bind("this") Node node) {
+        if (denormalized.profile(node, index < 0)) {
             index += array.size;
         }
         return readNormalizedNode.executeRead(array, index);

src/main/java/org/truffleruby/core/inlined/InlinedIndexSetNode.java

@@ -10,6 +10,8 @@
 package org.truffleruby.core.inlined;
 
 import com.oracle.truffle.api.dsl.Bind;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.profiles.InlinedConditionProfile;
 import org.truffleruby.RubyLanguage;
 import org.truffleruby.core.array.ArrayWriteNormalizedNode;
 import org.truffleruby.core.array.AssignableNode;
@@ -22,7 +24,6 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public abstract class InlinedIndexSetNode extends TernaryInlinedOperationNode implements AssignableNode {
 
@@ -40,10 +41,11 @@ public InlinedIndexSetNode(RubyLanguage language, RubyCallNodeParameters callNod
                     "normalizedIndex >= 0" },
             assumptions = "assumptions",
             limit = "1")
-    protected Object arrayWrite(VirtualFrame frame, RubyArray array, int index, Object value,
+    protected static Object arrayWrite(VirtualFrame frame, RubyArray array, int index, Object value,
             @Cached LookupMethodOnSelfNode lookupNode,
-            @Cached ConditionProfile denormalized,
-            @Bind("normalize(array, index, denormalized)") int normalizedIndex,
+            @Cached InlinedConditionProfile denormalized,
+            @Bind("this") Node node,
+            @Bind("normalize(node, array, index, denormalized)") int normalizedIndex,
             @Cached ArrayWriteNormalizedNode writeNode) {
         return writeNode.executeWrite(array, normalizedIndex, value);
     }
@@ -53,8 +55,8 @@ protected Object fallback(VirtualFrame frame, Object a, Object b, Object c) {
         return rewriteAndCall(frame, a, b, c);
     }
 
-    protected int normalize(RubyArray array, int index, ConditionProfile denormalized) {
-        if (denormalized.profile(index < 0)) {
+    protected int normalize(Node node, RubyArray array, int index, InlinedConditionProfile denormalized) {
+        if (denormalized.profile(node, index < 0)) {
             index += array.size;
         }
         return index;