Reduce duplicated code in regexp instrumentation.

Author: nirvdrum

src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java

@@ -363,43 +363,29 @@ protected <T> RubyArray fillinInstrumentData(Map<T, AtomicInteger> map, ArrayBui
         }
     }
 
-    @CoreMethod(names = "literal_regexp_compilation_stats_array", onSingleton = true, required = 0)
-    public abstract static class LiteralRegexpCompilationStatsArrayNode extends RegexpStatsNode {
+    @CoreMethod(names = "regexp_compilation_stats_array", onSingleton = true, required = 1)
+    public abstract static class RegexpCompilationStatsArrayNode extends RegexpStatsNode {
 
         @Specialization
-        protected Object buildStatsArray(
+        protected Object buildStatsArray(boolean literalRegexps,
                 @Cached ArrayBuilderNode arrayBuilderNode) {
-            return fillinInstrumentData(COMPILED_REGEXPS_LITERAL, arrayBuilderNode, getContext());
-        }
-    }
-
-    @CoreMethod(names = "dynamic_regexp_compilation_stats_array", onSingleton = true, required = 0)
-    public abstract static class DynamicRegexpCompilationStatsArrayNode extends RegexpStatsNode {
-
-        @Specialization
-        protected Object buildStatsArray(
-                @Cached ArrayBuilderNode arrayBuilderNode) {
-            return fillinInstrumentData(COMPILED_REGEXPS_DYNAMIC, arrayBuilderNode, getContext());
-        }
-    }
-
-    @CoreMethod(names = "joni_match_stats_array", onSingleton = true, required = 0)
-    public abstract static class JoniMatchStatsArrayNode extends RegexpStatsNode {
-
-        @Specialization
-        protected Object buildStatsArray(
-                @Cached ArrayBuilderNode arrayBuilderNode) {
-            return fillinInstrumentData(MATCHED_REGEXPS_JONI, arrayBuilderNode, getContext());
+            return fillinInstrumentData(
+                    literalRegexps ? COMPILED_REGEXPS_LITERAL : COMPILED_REGEXPS_DYNAMIC,
+                    arrayBuilderNode,
+                    getContext());
         }
     }
 
-    @CoreMethod(names = "tregex_match_stats_array", onSingleton = true, required = 0)
-    public abstract static class TRegexMatchStatsArrayNode extends RegexpStatsNode {
+    @CoreMethod(names = "match_stats_array", onSingleton = true, required = 1)
+    public abstract static class MatchStatsArrayNode extends RegexpStatsNode {
 
         @Specialization
-        protected Object buildStatsArray(
+        protected Object buildStatsArray(boolean joniMatches,
                 @Cached ArrayBuilderNode arrayBuilderNode) {
-            return fillinInstrumentData(MATCHED_REGEXPS_TREGEX, arrayBuilderNode, getContext());
+            return fillinInstrumentData(
+                    joniMatches ? MATCHED_REGEXPS_JONI : MATCHED_REGEXPS_TREGEX,
+                    arrayBuilderNode,
+                    getContext());
         }
     }
 

src/main/ruby/truffleruby/core/truffle/regexp_operations.rb

@@ -154,20 +154,12 @@ def self.return_match_data(md)
       end
     end
 
-    def self.compilation_stats_literal_regexp
-      Hash[*literal_regexp_compilation_stats_array]
+    def self.compilation_stats_regexp(literal_regexps:)
+      Hash[*regexp_compilation_stats_array(literal_regexps)]
     end
 
-    def self.compilation_stats_dynamic_regexp
-      Hash[*dynamic_regexp_compilation_stats_array]
-    end
-
-    def self.match_stats_joni
-      Hash[*joni_match_stats_array]
-    end
-
-    def self.match_stats_tregex
-      Hash[*tregex_match_stats_array]
+    def self.match_stats(joni_matches:)
+      Hash[*match_stats_array(joni_matches)]
     end
 
     def self.print_stats
@@ -180,19 +172,19 @@ def self.print_stats
 
         if Truffle::Boot.get_option('regexp-instrument-creation')
           puts '  Compilation (Literal)'
-          print_stats_table compilation_stats_literal_regexp
+          print_stats_table compilation_stats_regexp(literal_regexps: true)
           puts '  --------------------'
           puts '  Compilation (Dynamic)'
-          print_stats_table compilation_stats_dynamic_regexp
+          print_stats_table compilation_stats_regexp(literal_regexps: false)
           puts '  --------------------'
         end
 
         if Truffle::Boot.get_option('regexp-instrument-match')
           puts '  Matches (Joni)'
-          print_stats_table match_stats_joni
+          print_stats_table match_stats(joni_matches: true)
           puts '  --------------------'
           puts '  Matches (TRegex)'
-          print_stats_table match_stats_tregex
+          print_stats_table match_stats(joni_matches: false)
 
           if Truffle::Boot.get_option('regexp-instrument-creation')
             puts '  --------------------'