[GR-31350] [GR-32680] Migrate to profileAndReportLoopCount()

PullRequest: truffleruby/2820

Author: eregon

src/main/.checkstyle_checks.xml

@@ -234,6 +234,14 @@
       <property name="format" value='Collections\.newSetFromMap\(new ConcurrentHashMap'/>
       <property name="message" value="Use ConcurrentHashMap.newKeySet() instead."/>
     </module>
+    <module name="RegexpSinglelineJava">
+      <property name="format" value='LoopNode\.reportLoopCount\('/>
+      <property name="message" value="Use profileAndReportLoopCount() instead."/>
+    </module>
+    <module name="RegexpSinglelineJava">
+      <property name="format" value='\.profileCounted\('/>
+      <property name="message" value="Use profileAndReportLoopCount() instead."/>
+    </module>
     <module name="IllegalType">
       <!-- Use PrintStream instead of PrintWriter, PrintWriter does not consistently flush, even when writing \n.-->
       <property name="illegalClassNames" value="TruffleObject,DynamicObject,PrintWriter"/>

src/main/java/org/truffleruby/cext/UnwrapNode.java

@@ -17,7 +17,6 @@
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
-import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
@@ -227,12 +226,15 @@ protected Object[] unwrapCArray(Object cArray,
                 @Cached UnwrapNode unwrapNode,
                 @Cached LoopConditionProfile loopProfile) {
             final Object[] store = new Object[size];
-            loopProfile.profileCounted(size);
-            for (int i = 0; loopProfile.inject(i < size); i++) {
-                final Object cValue = readArrayElement(cArray, interop, i);
-                store[i] = unwrapNode.execute(cValue);
+            int i = 0;
+            try {
+                for (; loopProfile.inject(i < size); i++) {
+                    final Object cValue = readArrayElement(cArray, interop, i);
+                    store[i] = unwrapNode.execute(cValue);
+                }
+            } finally {
+                profileAndReportLoopCount(loopProfile, i);
             }
-            LoopNode.reportLoopCount(this, size);
             return store;
         }
 

src/main/java/org/truffleruby/core/array/ArrayCopyCompatibleRangeNode.java

@@ -9,7 +9,6 @@
  */
 package org.truffleruby.core.array;
 
-import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
 import org.truffleruby.core.array.library.ArrayStoreLibrary;
 import org.truffleruby.language.RubyBaseNode;
@@ -67,12 +66,11 @@ protected void copy(RubyArray dst, RubyArray src, int dstStart, int srcStart, in
                 !isSrcShared.executeIsShared(src))) {
             int i = 0;
             try {
-                loopProfile.profileCounted(length);
                 for (; loopProfile.inject(i < length); ++i) {
                     writeBarrierNode.executeWriteBarrier(stores.read(srcStore, i));
                 }
             } finally {
-                LoopNode.reportLoopCount(this, i);
+                profileAndReportLoopCount(loopProfile, i);
             }
         }
     }

src/main/java/org/truffleruby/core/array/ArrayEachIteratorNode.java

@@ -19,7 +19,6 @@
 import com.oracle.truffle.api.dsl.ReportPolymorphism;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.library.CachedLibrary;
-import com.oracle.truffle.api.nodes.LoopNode;
 import com.oracle.truffle.api.nodes.NodeInterface;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
@@ -66,7 +65,6 @@ protected RubyArray iterateMany(RubyArray array, RubyProc block, int startAt, Ar
             @Cached LoopConditionProfile loopProfile,
             @Cached ConditionProfile strategyMatchProfile) {
         int i = startAt;
-        loopProfile.profileCounted(array.size - startAt);
         try {
             for (; loopProfile.inject(i < array.size); i++) {
                 if (strategyMatchProfile.profile(arrays.accepts(array.store))) {
@@ -77,7 +75,7 @@ protected RubyArray iterateMany(RubyArray array, RubyProc block, int startAt, Ar
                 }
             }
         } finally {
-            LoopNode.reportLoopCount(this, i - startAt);
+            profileAndReportLoopCount(loopProfile, i - startAt);
         }
 
         return array;