@@ -65,47 +65,47 @@ public static void markAnalysisFinished() {
6565 }
6666
6767 public static boolean isAnalysisFinished () {
68- return singleton ().analysisFinished ;
68+ return ImageSingletons . contains ( BuildPhaseProvider . class ) && singleton ().analysisFinished ;
6969 }
7070
7171 public static void markHostedUniverseBuilt () {
7272 singleton ().hostedUniverseBuilt = true ;
7373 }
7474
7575 public static boolean isHostedUniverseBuilt () {
76- return singleton ().hostedUniverseBuilt ;
76+ return ImageSingletons . contains ( BuildPhaseProvider . class ) && singleton ().hostedUniverseBuilt ;
7777 }
7878
7979 public static void markReadyForCompilation () {
8080 singleton ().readyForCompilation = true ;
8181 }
8282
8383 public static boolean isReadyForCompilation () {
84- return singleton ().readyForCompilation ;
84+ return ImageSingletons . contains ( BuildPhaseProvider . class ) && singleton ().readyForCompilation ;
8585 }
8686
8787 public static void markCompileQueueFinished () {
8888 singleton ().compileQueueFinished = true ;
8989 }
9090
9191 public static boolean isCompileQueueFinished () {
92- return singleton ().compileQueueFinished ;
92+ return ImageSingletons . contains ( BuildPhaseProvider . class ) && singleton ().compileQueueFinished ;
9393 }
9494
9595 public static void markCompilationFinished () {
9696 singleton ().compilationFinished = true ;
9797 }
9898
9999 public static boolean isCompilationFinished () {
100- return singleton ().compilationFinished ;
100+ return ImageSingletons . contains ( BuildPhaseProvider . class ) && singleton ().compilationFinished ;
101101 }
102102
103103 public static void markHeapLayoutFinished () {
104104 singleton ().heapLayoutFinished = true ;
105105 }
106106
107107 public static boolean isHeapLayoutFinished () {
108- return singleton ().heapLayoutFinished ;
108+ return ImageSingletons . contains ( BuildPhaseProvider . class ) && singleton ().heapLayoutFinished ;
109109 }
110110
111111 public static class AfterAnalysis implements BooleanSupplier {
0 commit comments