clear cache in EnumSwitchPlugin after Analysis

Author: wirthi

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/EnumSwitchPlugin.java

@@ -95,8 +95,8 @@ public boolean handleInvoke(GraphBuilderContext b, ResolvedJavaMethod m, ValueNo
          * that end up in the same class or in the JDK.
          */
         EnumSwitchFeature feature = ImageSingletons.lookup(EnumSwitchFeature.class);
-        method.ensureGraphParsed(feature.bb);
-        Boolean methodSafeForExecution = feature.methodsSafeForExecution.get(method);
+        method.ensureGraphParsed(feature.getBigBang());
+        Boolean methodSafeForExecution = feature.isMethodsSafeForExecution(method);
         assert methodSafeForExecution != null : "after-parsing hook not executed for method " + method.format("%H.%n(%p)");
         if (!methodSafeForExecution.booleanValue()) {
             return false;
@@ -121,9 +121,9 @@ public boolean handleInvoke(GraphBuilderContext b, ResolvedJavaMethod m, ValueNo
 @AutomaticallyRegisteredFeature
 final class EnumSwitchFeature implements InternalFeature {
 
-    BigBang bb;
+    private BigBang bb;
 
-    final ConcurrentMap<AnalysisMethod, Boolean> methodsSafeForExecution = new ConcurrentHashMap<>();
+    private ConcurrentMap<AnalysisMethod, Boolean> methodsSafeForExecution = new ConcurrentHashMap<>();
 
     @Override
     public void duringSetup(DuringSetupAccess a) {
@@ -142,10 +142,19 @@ private void onMethodParsed(AnalysisMethod method, StructuredGraph graph) {
     @Override
     public void afterAnalysis(AfterAnalysisAccess access) {
         bb = null;
+        methodsSafeForExecution = null;
     }
 
     @Override
     public void registerGraphBuilderPlugins(Providers providers, Plugins plugins, ParsingReason reason) {
         plugins.appendNodePlugin(new EnumSwitchPlugin(reason));
     }
+
+    Boolean isMethodsSafeForExecution(AnalysisMethod method) {
+        return methodsSafeForExecution.get(method);
+    }
+
+    public BigBang getBigBang() {
+        return bb;
+    }
 }