Encoded snippets should use snippet debug context

Author: tkrodriguez

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/EncodedSnippets.java

@@ -349,7 +349,7 @@ static StructuredGraph decodeSnippetGraph(SymbolicEncodedGraph encodedGraph, Res
             nodePlugins = new NodePlugin[]{new SnippetCounterFoldingPlugin()};
         }
 
-        try (DebugContext debug = replacements.openDebugContext("LibGraal", method, options)) {
+        try (DebugContext debug = replacements.openSnippetDebugContext("LibGraal", method, options)) {
             // @formatter:off
             boolean isSubstitution = true;
             StructuredGraph result = new StructuredGraph.Builder(options, debug, allowAssumptions)

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/SymbolicSnippetEncoder.java

@@ -279,7 +279,7 @@ private StructuredGraph buildGraph(ResolvedJavaMethod method, ResolvedJavaMethod
         // Dumps of the graph preparation step can be captured with -H:Dump=LibGraal:2 and
         // MethodFilter can be used to focus on particular snippets.
         IntrinsicContext.CompilationContext contextToUse = IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
-        try (DebugContext debug = snippetReplacements.openDebugContext("LibGraalBuildGraph_", method, options)) {
+        try (DebugContext debug = snippetReplacements.openSnippetDebugContext("LibGraalBuildGraph_", method, options)) {
             StructuredGraph graph;
             try (DebugContext.Scope s = debug.scope("LibGraal", method)) {
                 graph = snippetReplacements.makeGraph(debug, snippetReplacements.getDefaultReplacementBytecodeProvider(), method, args, nonNullParameters, original,

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/ReplacementsImpl.java

@@ -272,10 +272,6 @@ public DebugContext openSnippetDebugContext(String idPrefix, ResolvedJavaMethod
         return openSnippetDebugContext(idPrefix, method, DebugContext.forCurrentThread(), options);
     }
 
-    public DebugContext openDebugContext(String idPrefix, ResolvedJavaMethod method, OptionValues options) {
-        return openDebugContext(idPrefix, method, options, DebugContext.forCurrentThread(), false);
-    }
-
     private static final AtomicInteger nextDebugContextId = new AtomicInteger();
 
     private DebugContext openDebugContext(String idPrefix, ResolvedJavaMethod method, OptionValues options, DebugContext outer, boolean disabled) {