src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.core/src/org/graalvm/compiler/core/match/MatchRuleRegistry.java

*** 20,45 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.match;
  
! import static org.graalvm.compiler.debug.GraalDebugConfig.Options.LogVerbose;
  import java.util.ArrayList;
  import java.util.List;
  
  import org.graalvm.compiler.core.gen.NodeMatchRules;
! import org.graalvm.compiler.debug.Debug;
! import org.graalvm.compiler.debug.Debug.Scope;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.Edges;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.graph.Position;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.serviceprovider.GraalServices;
- import org.graalvm.util.Equivalence;
  import org.graalvm.util.EconomicMap;
  import org.graalvm.util.MapCursor;
  
  public class MatchRuleRegistry {
  
      /**
--- 20,45 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  package org.graalvm.compiler.core.match;
  
! import static org.graalvm.compiler.debug.DebugOptions.LogVerbose;
! 
  import java.util.ArrayList;
  import java.util.List;
  
  import org.graalvm.compiler.core.gen.NodeMatchRules;
! import org.graalvm.compiler.debug.DebugContext;
  import org.graalvm.compiler.debug.GraalError;
  import org.graalvm.compiler.graph.Edges;
  import org.graalvm.compiler.graph.Node;
  import org.graalvm.compiler.graph.NodeClass;
  import org.graalvm.compiler.graph.Position;
  import org.graalvm.compiler.options.OptionValues;
  import org.graalvm.compiler.serviceprovider.GraalServices;
  import org.graalvm.util.EconomicMap;
+ import org.graalvm.util.Equivalence;
  import org.graalvm.util.MapCursor;
  
  public class MatchRuleRegistry {
  
      /**
*** 75,101 ****
       * @param theClass
       * @param options
       * @return the set of {@link MatchStatement}s applicable to theClass.
       */
      @SuppressWarnings("try")
!     public static synchronized EconomicMap<Class<? extends Node>, List<MatchStatement>> lookup(Class<? extends NodeMatchRules> theClass, OptionValues options) {
          EconomicMap<Class<? extends Node>, List<MatchStatement>> result = registry.get(theClass);
  
          if (result == null) {
              EconomicMap<Class<? extends Node>, List<MatchStatement>> rules = createRules(theClass);
              registry.put(theClass, rules);
              assert registry.get(theClass) == rules;
              result = rules;
  
              if (LogVerbose.getValue(options)) {
!                 try (Scope s = Debug.scope("MatchComplexExpressions")) {
!                     Debug.log("Match rules for %s", theClass.getSimpleName());
                      MapCursor<Class<? extends Node>, List<MatchStatement>> cursor = result.getEntries();
                      while (cursor.advance()) {
!                         Debug.log("  For node class: %s", cursor.getKey());
                          for (MatchStatement statement : cursor.getValue()) {
!                             Debug.log("    %s", statement.getPattern());
                          }
                      }
                  }
              }
          }
--- 75,101 ----
       * @param theClass
       * @param options
       * @return the set of {@link MatchStatement}s applicable to theClass.
       */
      @SuppressWarnings("try")
!     public static synchronized EconomicMap<Class<? extends Node>, List<MatchStatement>> lookup(Class<? extends NodeMatchRules> theClass, OptionValues options, DebugContext debug) {
          EconomicMap<Class<? extends Node>, List<MatchStatement>> result = registry.get(theClass);
  
          if (result == null) {
              EconomicMap<Class<? extends Node>, List<MatchStatement>> rules = createRules(theClass);
              registry.put(theClass, rules);
              assert registry.get(theClass) == rules;
              result = rules;
  
              if (LogVerbose.getValue(options)) {
!                 try (DebugContext.Scope s = debug.scope("MatchComplexExpressions")) {
!                     debug.log("Match rules for %s", theClass.getSimpleName());
                      MapCursor<Class<? extends Node>, List<MatchStatement>> cursor = result.getEntries();
                      while (cursor.advance()) {
!                         debug.log("  For node class: %s", cursor.getKey());
                          for (MatchStatement statement : cursor.getValue()) {
!                             debug.log("    %s", statement.getPattern());
                          }
                      }
                  }
              }
          }