Cleanups

oracle · Feb 14, 2022 · 604d98e · 604d98e
1 parent 3e7b4fe
commit 604d98e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/...rg.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java b/...rg.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java
@@ -170,12 +170,6 @@ public static boolean snippetsAreEncoded() {
         return encodedSnippets != null;
     }
 
-    public static void maybeEncodeSnippets(OptionValues options) {
-        if (!IS_IN_NATIVE_IMAGE && snippetEncoder != null) {
-            snippetEncoder.encode(options);
-        }
-    }
-
     public void clearSnippetParameterNames() {
         assert snippetEncoder != null;
         snippetEncoder.clearSnippetParameterNames();
@@ -202,8 +196,6 @@ public boolean encode(OptionValues options) {
     public StructuredGraph getSnippet(ResolvedJavaMethod method, ResolvedJavaMethod original, Object[] args, BitSet nonNullParameters, boolean trackNodeSourcePosition,
                     NodeSourcePosition replaceePosition, OptionValues options) {
         if (IS_IN_NATIVE_IMAGE) {
-            maybeEncodeSnippets(options);
-
             // Snippets graphs can contain foreign object references and
             // outlive a single compilation.
             try (CompilationContext scope = HotSpotGraalServices.enterGlobalCompilationContext()) {

diff --git a/...org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java b/...org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java
@@ -280,6 +280,7 @@ synchronized void registerConditionalPlugin(InvocationPlugin plugin) {
         conditionalPlugins.add(plugin);
     }
 
+    @SuppressWarnings("try")
     private StructuredGraph buildGraph(ResolvedJavaMethod method, ResolvedJavaMethod original, Object receiver, BitSet nonNullParameters,
                     boolean trackNodeSourcePosition, OptionValues options, ReplacementsImpl snippetReplacements) {
         assert method.hasBytecodes() : "Snippet must not be abstract or native";