compiler: add shouldVerifyWordFactory

Author: zapster

compiler/src/jdk.graal.compiler.test/src/jdk/graal/compiler/core/test/CheckGraalInvariants.java

@@ -253,6 +253,9 @@ public boolean checkAssertions() {
             return true;
         }
 
+        public boolean shouldVerifyWordFactory(@SuppressWarnings("unused") ResolvedJavaMethod method) {
+            return true;
+        }
     }
 
     @Test
@@ -416,7 +419,7 @@ public static void runTest(InvariantsTool tool) {
                     graphBuilderSuite.apply(graph, context);
                     // update phi stamps
                     graph.getNodes().filter(PhiNode.class).forEach(PhiNode::inferStamp);
-                    checkGraph(verifiers, context, graph);
+                    checkGraph(verifiers, context, graph, tool);
                     errors.add(String.format("Expected error while checking %s", m));
                 } catch (VerificationError e) {
                     // expected!
@@ -477,7 +480,7 @@ public static void runTest(InvariantsTool tool) {
                                         // update phi stamps
                                         graph.getNodes().filter(PhiNode.class).forEach(PhiNode::inferStamp);
                                         collectOptionFieldUsages(optionFieldUsages, optionDescriptorsType, method, graph);
-                                        checkGraph(verifiers, context, graph);
+                                        checkGraph(verifiers, context, graph, tool);
                                     } catch (VerificationError e) {
                                         errors.add(e.getMessage());
                                     } catch (BailoutException e) {
@@ -701,13 +704,15 @@ private static void checkMethod(ResolvedJavaMethod method) {
     /**
      * Checks the invariants for a single graph.
      */
-    private static void checkGraph(List<VerifyPhase<CoreProviders>> verifiers, HighTierContext context, StructuredGraph graph) {
+    private static void checkGraph(List<VerifyPhase<CoreProviders>> verifiers, HighTierContext context, StructuredGraph graph, InvariantsTool tool) {
         for (VerifyPhase<CoreProviders> verifier : verifiers) {
-            if (!(verifier instanceof VerifyUsageWithEquals) || shouldVerifyEquals(graph.method())) {
-                verifier.apply(graph, context);
-            } else {
-                verifier.apply(graph, context);
+            if (verifier instanceof VerifyUsageWithEquals && !shouldVerifyEquals(graph.method())) {
+                continue;
+            }
+            if (verifier instanceof VerifyWordFactoryUsage && !tool.shouldVerifyWordFactory(graph.method())) {
+                continue;
             }
+            verifier.apply(graph, context);
         }
         if (graph.method().isBridge()) {
             BridgeMethodUtils.getBridgedMethod(graph.method());