Improve UninterruptibleAnnotationChecker.

Author: christianhaeubl

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/UninterruptibleAnnotationChecker.java

@@ -45,6 +45,7 @@
 import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.Uninterruptible;
+import com.oracle.svm.core.classinitialization.EnsureClassInitializedNode;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.os.RawFileOperationSupport;
@@ -73,8 +74,7 @@ private static UninterruptibleAnnotationChecker singleton() {
 
     public static void checkAfterParsing(ResolvedJavaMethod method, StructuredGraph graph) {
         if (Uninterruptible.Utils.isUninterruptible(method) && graph != null) {
-            singleton().checkNoAllocation(method, graph);
-            singleton().checkNoSynchronization(method, graph);
+            singleton().checkGraph(method, graph);
         }
     }
 
@@ -134,12 +134,6 @@ private void checkSpecifiedOptions(HostedMethod method, Uninterruptible annotati
         }
 
         if (annotation.mayBeInlined()) {
-            if (!annotation.reason().equals(Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE) && !AnnotationAccess.isAnnotationPresent(method, AlwaysInline.class)) {
-                violations.add("Method " + method.format("%H.%n(%p)") + " is annotated with @Uninterruptible('mayBeInlined = true') which allows the method to be inlined into interruptible code. " +
-                                "If the method has an inherent reason for being uninterruptible, besides being called from uninterruptible code, then please remove 'mayBeInlined = true'. " +
-                                "Otherwise, use the following reason: '" + Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE + "'");
-            }
-
             if (AnnotationAccess.isAnnotationPresent(method, NeverInline.class)) {
                 violations.add("Method " + method.format("%H.%n(%p)") +
                                 " is annotated with conflicting annotations: @Uninterruptible('mayBeInlined = true') and @NeverInline");
@@ -151,6 +145,14 @@ private void checkSpecifiedOptions(HostedMethod method, Uninterruptible annotati
             }
         }
 
+        if (annotation.mayBeInlined() && annotation.calleeMustBe()) {
+            if (!annotation.reason().equals(Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE) && !AnnotationAccess.isAnnotationPresent(method, AlwaysInline.class)) {
+                violations.add("Method " + method.format("%H.%n(%p)") + " is annotated with @Uninterruptible('mayBeInlined = true') which allows the method to be inlined into interruptible code. " +
+                                "If the method has an inherent reason for being uninterruptible, besides being called from uninterruptible code, then please remove 'mayBeInlined = true'. " +
+                                "Otherwise, use the following reason: '" + Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE + "'");
+            }
+        }
+
         if (!annotation.mayBeInlined() && !annotation.callerMustBe() && AnnotationAccess.isAnnotationPresent(method, AlwaysInline.class)) {
             violations.add("Method " + method.format("%H.%n(%p)") +
                             " is annotated with @Uninterruptible and @AlwaysInline. If the method may be inlined into interruptible code, please specify 'mayBeInlined = true'. Otherwise, specify 'callerMustBe = true'.");
@@ -259,18 +261,14 @@ private void checkCallers(HostedMethod caller, Uninterruptible callerAnnotation,
         }
     }
 
-    private void checkNoAllocation(ResolvedJavaMethod method, StructuredGraph graph) {
+    private void checkGraph(ResolvedJavaMethod method, StructuredGraph graph) {
         for (Node node : graph.getNodes()) {
             if (isAllocationNode(node)) {
                 violations.add("Uninterruptible method " + method.format("%H.%n(%p)") + " is not allowed to allocate.");
-            }
-        }
-    }
-
-    private void checkNoSynchronization(ResolvedJavaMethod method, StructuredGraph graph) {
-        for (Node node : graph.getNodes()) {
-            if (node instanceof MonitorEnterNode) {
+            } else if (node instanceof MonitorEnterNode) {
                 violations.add("Uninterruptible method " + method.format("%H.%n(%p)") + " is not allowed to use 'synchronized'.");
+            } else if (node instanceof EnsureClassInitializedNode) {
+                violations.add("Uninterruptible method " + method.format("%H.%n(%p)") + " not allowed to do class initialization.");
             }
         }
     }