test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java

@@ -274,29 +274,29 @@
          superWordNodes(ADD_REDUCTION_VL, "AddReductionVL");
      }
  
      public static final String ALLOC = PREFIX + "ALLOC" + POSTFIX;
      static {
-         String optoRegex = "(.*precise .*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
+         String optoRegex = "(.*precise .*\\R((.*(?i:mov|mv|xorl|nop|spill|pushq|popq).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
          allocNodes(ALLOC, "Allocate", optoRegex);
      }
  
      public static final String ALLOC_OF = COMPOSITE_PREFIX + "ALLOC_OF" + POSTFIX;
      static {
-         String regex = "(.*precise .*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
+         String regex = "(.*precise .*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill|pushq|popq).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
          optoOnly(ALLOC_OF, regex);
      }
  
      public static final String ALLOC_ARRAY = PREFIX + "ALLOC_ARRAY" + POSTFIX;
      static {
-         String optoRegex = "(.*precise \\[.*\\R((.*(?i:mov|mv|xor|nop|spill).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: _new_array_Java" + END;
+         String optoRegex = "(.*precise \\[.*\\R((.*(?i:mov|mv|xor|nop|spill|pushq|popq).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: _new_array_Java" + END;
          allocNodes(ALLOC_ARRAY, "AllocateArray", optoRegex);
      }
  
      public static final String ALLOC_ARRAY_OF = COMPOSITE_PREFIX + "ALLOC_ARRAY_OF" + POSTFIX;
      static {
-         String regex = "(.*precise \\[.*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: _new_array_Java" + END;
+         String regex = "(.*precise \\[.*" + IS_REPLACED + ":.*\\R((.*(?i:mov|mv|xorl|nop|spill|pushq|popq).*|\\s*|.*(LGHI|LI).*)\\R)*.*(?i:call,static).*wrapper for: _new_array_Java" + END;
          optoOnly(ALLOC_ARRAY_OF, regex);
      }
  
      public static final String AND = PREFIX + "AND" + POSTFIX;
      static {

@@ -544,10 +544,15 @@
      public static final String IF = PREFIX + "IF" + POSTFIX;
      static {
          beforeMatchingNameRegex(IF, "If\\b");
      }
  
+     public static final String INLINE_TYPE = PREFIX + "INLINE_TYPE" + POSTFIX;
+     static {
+         beforeMatchingNameRegex(INLINE_TYPE, "InlineType");
+     }
+ 
      // Does not work for VM builds without JVMCI like x86_32 (a rule containing this regex will be skipped without having JVMCI built).
      public static final String INTRINSIC_OR_TYPE_CHECKED_INLINING_TRAP = PREFIX + "INTRINSIC_OR_TYPE_CHECKED_INLINING_TRAP" + POSTFIX;
      static {
          trapNodes(INTRINSIC_OR_TYPE_CHECKED_INLINING_TRAP, "intrinsic_or_type_checked_inlining");
      }

@@ -2143,11 +2148,11 @@
  
      /**
       * Apply {@code regex} on all machine independent ideal graph phases up to and including
       * {@link CompilePhase#BEFORE_MATCHING}.
       */
-     private static void beforeMatching(String irNodePlaceholder, String regex) {
+     public static void beforeMatching(String irNodePlaceholder, String regex) {
          IR_NODE_MAPPINGS.put(irNodePlaceholder, new RegexTypeEntry(RegexType.IDEAL_INDEPENDENT, regex));
      }
  
      /**
       * Apply {@code irNodeRegex} as regex for the IR node name on all machine independent ideal graph phases up to and

@@ -2189,11 +2194,11 @@
  
      /**
       * Apply {@code regex} on all machine dependant ideal graph phases (i.e. on the mach graph) starting from
       * {@link CompilePhase#MATCHING}.
       */
-     private static void optoOnly(String irNodePlaceholder, String regex) {
+     public static void optoOnly(String irNodePlaceholder, String regex) {
          IR_NODE_MAPPINGS.put(irNodePlaceholder, new RegexTypeEntry(RegexType.OPTO_ASSEMBLY, regex));
      }
  
      private static void machOnly(String irNodePlaceholder, String regex) {
          IR_NODE_MAPPINGS.put(irNodePlaceholder, new RegexTypeEntry(RegexType.MACH, regex));