channel early error through normal error reporting

pengxiaolong · May 28, 2024 · 9173929 · 9173929
1 parent cbbdc31
commit 9173929
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java
@@ -705,23 +705,21 @@ public void printEpilog(Optional<String> optionalImageName, Optional<NativeImage
         executor.shutdown();
 
         boolean singletonSupportAvailable = ImageSingletonsSupport.isInstalled() && ImageSingletons.contains(BuildArtifacts.class) && ImageSingletons.contains(TimerCollection.class);
-        if (!singletonSupportAvailable) {
-            l().a("Failed early during image build process").println();
-            printErrorMessage(optionalUnhandledThrowable, parsedHostedOptions, true);
-            return;
-        }
-
         if (optionalUnhandledThrowable.isPresent()) {
             Path errorReportPath = NativeImageOptions.getErrorFilePath(parsedHostedOptions);
             Optional<FeatureHandler> featureHandler = optionalGenerator.map(nativeImageGenerator -> nativeImageGenerator.featureHandler);
             ReportUtils.report("GraalVM Native Image Error Report", errorReportPath,
                             p -> VMErrorReporter.generateErrorReport(p, buildOutputLog, classLoader, featureHandler, optionalUnhandledThrowable.get()),
                             false);
+            if (!singletonSupportAvailable) {
+                printErrorMessage(optionalUnhandledThrowable, parsedHostedOptions);
+                return;
+            }
             BuildArtifacts.singleton().add(ArtifactType.BUILD_INFO, errorReportPath);
         }
 
-        if (optionalImageName.isEmpty() || optionalGenerator.isEmpty()) {
-            printErrorMessage(optionalUnhandledThrowable, parsedHostedOptions, false);
+        if (!singletonSupportAvailable || optionalImageName.isEmpty() || optionalGenerator.isEmpty()) {
+            printErrorMessage(optionalUnhandledThrowable, parsedHostedOptions);
             return;
         }
         String imageName = optionalImageName.get();
@@ -747,17 +745,17 @@ public void printEpilog(Optional<String> optionalImageName, Optional<NativeImage
         l().a(wasSuccessfulBuild ? "Finished" : "Failed").a(" generating '").bold().a(imageName).reset().a("' ")
                         .a(wasSuccessfulBuild ? "in" : "after").a(" ").a(timeStats).a(".").println();
 
-        printErrorMessage(optionalUnhandledThrowable, parsedHostedOptions, false);
+        printErrorMessage(optionalUnhandledThrowable, parsedHostedOptions);
     }
 
-    private void printErrorMessage(Optional<Throwable> optionalUnhandledThrowable, OptionValues parsedHostedOptions, boolean forceStackTrace) {
+    private void printErrorMessage(Optional<Throwable> optionalUnhandledThrowable, OptionValues parsedHostedOptions) {
         if (optionalUnhandledThrowable.isEmpty()) {
             return;
         }
         Throwable unhandledThrowable = optionalUnhandledThrowable.get();
         l().println();
         l().redBold().a("The build process encountered an unexpected error:").reset().println();
-        if (forceStackTrace || NativeImageOptions.ReportExceptionStackTraces.getValue(parsedHostedOptions)) {
+        if (NativeImageOptions.ReportExceptionStackTraces.getValue(parsedHostedOptions)) {
             l().dim().println();
             unhandledThrowable.printStackTrace(builderIO.getOut());
             l().reset().println();