Adjust VerifyDebugUsage to allow parameterized dumpLevel in calls to DebugContext#dump from explicitly listed methods.

Author: jchalou

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

@@ -137,8 +137,7 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
                     MethodSource.of("com.oracle.graal.pointsto.phases.InlineBeforeAnalysis", "decodeGraph"),
                     MethodSource.of("com.oracle.svm.hosted.classinitialization.SimulateClassInitializerSupport", "decodeGraph"),
                     MethodSource.of("com.oracle.svm.hosted.classinitialization.SimulateClassInitializerAbortException", "doAbort"),
-                    MethodSource.of(CallTree.class, "dumpBasic"),
-                    MethodSource.of(CallTree.class, "GraphManager", "peRoot"));
+                    MethodSource.of(CallTree.class, "dumpBasic"));
 
     /**
      * The set of methods allowed to call a {@code Debug.dump(...)} method with the {@code level}
@@ -156,7 +155,17 @@ protected void verify(StructuredGraph graph, CoreProviders context) {
                     MethodSource.of(SnippetTemplate.class, "instantiate"),
                     MethodSource.of(SnippetTemplate.class, "<init>"),
                     MethodSource.of(SymbolicSnippetEncoder.class, "verifySnippetEncodeDecode"),
-                    MethodSource.of(CallTree.class, "dumpInfo"),
+                    MethodSource.of(CallTree.class, "dumpInfo"));
+
+    /**
+     * The set of methods allowed to call a {@code Debug.dump(...)} method with a variable
+     * {@code level} parameter and the {@code object} parameter bound to a {@link StructuredGraph}
+     * value.
+     *
+     * If you add a *justified* graph dump with variable level parameter, then update the allow
+     * list.
+     */
+    private static final Set<MethodSource> ParameterizedLevelStructuredGraphDumpAllowList = CollectionsUtil.setOf(
                     MethodSource.of(CallTree.class, "GraphManager", "pe"));
 
     @Override
@@ -175,7 +184,10 @@ protected void verifyParameters(MetaAccessProvider metaAccess1, MethodCallTarget
             allowedClasses.add(ReportHotCodePhase.class.getName());
             String callerClassName = debugCallTarget.graph().method().format("%H");
             if (!allowedClasses.contains(callerClassName)) {
-                int dumpLevel = verifyDumpLevelParameter(debugCallTarget, verifiedCallee, args.get(1));
+                ResolvedJavaMethod callerMethod = debugCallTarget.graph().method();
+                Integer dumpLevel = ParameterizedLevelStructuredGraphDumpAllowList.stream().noneMatch(ms -> ms.matches(callerMethod))
+                                ? verifyDumpLevelParameter(debugCallTarget, verifiedCallee, args.get(1))
+                                : null;
                 verifyDumpObjectParameter(debugCallTarget, args.get(2), verifiedCallee, dumpLevel);
             }
         }
@@ -220,7 +232,13 @@ protected void verifyDumpObjectParameter(MethodCallTargetNode debugCallTarget, V
     protected void verifyStructuredGraphDumping(MethodCallTargetNode debugCallTarget, ResolvedJavaMethod verifiedCallee, Integer dumpLevel)
                     throws VerifyPhase.VerificationError {
         ResolvedJavaMethod method = debugCallTarget.graph().method();
-        if (dumpLevel == DebugContext.BASIC_LEVEL) {
+        if (dumpLevel == null) {
+            if (ParameterizedLevelStructuredGraphDumpAllowList.stream().noneMatch(ms -> ms.matches(method))) {
+                throw new VerificationError(
+                                debugCallTarget, "call to %s with parameterized level not in %s.ParameterizedLevelStructuredGraphDumpAllowList.%n", verifiedCallee.format("%H.%n(%p)"),
+                                getClass().getName());
+            }
+        } else if (dumpLevel == DebugContext.BASIC_LEVEL) {
             if (BasicLevelStructuredGraphDumpAllowList.stream().noneMatch(ms -> ms.matches(method))) {
                 throw new VerificationError(
                                 debugCallTarget, "call to %s with level == DebugContext.BASIC_LEVEL not in %s.BasicLevelStructuredGraphDumpAllowList.%n", verifiedCallee.format("%H.%n(%p)"),