[GR-32841] Update Truffle, which now automatically profiles LoopNode and RepeatingNode

Author: eregon

mx.truffleruby/suite.py

@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "c7604b7fd48cc8c3509cf215cd5e268748a81d85",
+                "version": "86651e3bf6af2662ada38eccdf1f5ebe632d30db",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "c7604b7fd48cc8c3509cf215cd5e268748a81d85",
+                "version": "86651e3bf6af2662ada38eccdf1f5ebe632d30db",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

src/main/java/org/truffleruby/core/format/control/StarNode.java

@@ -16,7 +16,6 @@
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RepeatingNode;
-import com.oracle.truffle.api.profiles.ConditionProfile;
 
 public class StarNode extends FormatNode {
 
@@ -36,15 +35,13 @@ private class StarRepeatingNode extends Node implements RepeatingNode {
 
         @Child private FormatNode child;
 
-        private final ConditionProfile conditionProfile = ConditionProfile.create();
-
         public StarRepeatingNode(FormatNode child) {
             this.child = child;
         }
 
         @Override
         public boolean executeRepeating(VirtualFrame frame) {
-            if (conditionProfile.profile(getSourcePosition(frame) >= getSourceLength(frame))) {
+            if (getSourcePosition(frame) >= getSourceLength(frame)) {
                 return false;
             }
 

src/main/java/org/truffleruby/language/control/WhileNode.java

@@ -22,7 +22,6 @@
 import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.RepeatingNode;
 import com.oracle.truffle.api.profiles.BranchProfile;
-import com.oracle.truffle.api.profiles.LoopConditionProfile;
 
 public final class WhileNode extends RubyContextSourceNode {
 
@@ -43,7 +42,6 @@ private abstract static class WhileRepeatingBaseNode extends RubyBaseNode implem
         @Child protected BooleanCastNode condition;
         @Child protected RubyNode body;
 
-        protected final LoopConditionProfile conditionProfile = LoopConditionProfile.createCountingProfile();
         protected final BranchProfile redoUsed = BranchProfile.create();
         protected final BranchProfile nextUsed = BranchProfile.create();
 
@@ -67,7 +65,7 @@ public WhileRepeatingNode(RubyNode condition, RubyNode body) {
 
         @Override
         public boolean executeRepeating(VirtualFrame frame) {
-            if (!conditionProfile.profile(condition.executeBoolean(frame))) {
+            if (!condition.executeBoolean(frame)) {
                 return false;
             }
 
@@ -106,7 +104,7 @@ public boolean executeRepeating(VirtualFrame frame) {
                 return true;
             }
 
-            return conditionProfile.profile(condition.executeBoolean(frame));
+            return condition.executeBoolean(frame);
         }
 
     }