Fixup InstallAPI post merge (#8434)

AM merge introduced some test failures.

Author: cyndyishida

clang/lib/Basic/DiagnosticIDs.cpp

@@ -49,8 +49,8 @@ struct StaticDiagInfoDescriptionStringTable {
 #include "clang/Basic/DiagnosticSemaKinds.inc"
 #include "clang/Basic/DiagnosticAnalysisKinds.inc"
 #include "clang/Basic/DiagnosticRefactoringKinds.inc"
-#include "clang/Basic/DiagnosticCASKinds.inc"
 #include "clang/Basic/DiagnosticInstallAPIKinds.inc"
+#include "clang/Basic/DiagnosticCASKinds.inc"
   // clang-format on
 #undef DIAG
 };
@@ -72,8 +72,8 @@ const StaticDiagInfoDescriptionStringTable StaticDiagInfoDescriptions = {
 #include "clang/Basic/DiagnosticSemaKinds.inc"
 #include "clang/Basic/DiagnosticAnalysisKinds.inc"
 #include "clang/Basic/DiagnosticRefactoringKinds.inc"
-#include "clang/Basic/DiagnosticCASKinds.inc"
 #include "clang/Basic/DiagnosticInstallAPIKinds.inc"
+#include "clang/Basic/DiagnosticCASKinds.inc"
 // clang-format on
 #undef DIAG
 };
@@ -99,8 +99,8 @@ const uint32_t StaticDiagInfoDescriptionOffsets[] = {
 #include "clang/Basic/DiagnosticSemaKinds.inc"
 #include "clang/Basic/DiagnosticAnalysisKinds.inc"
 #include "clang/Basic/DiagnosticRefactoringKinds.inc"
-#include "clang/Basic/DiagnosticCASKinds.inc"
 #include "clang/Basic/DiagnosticInstallAPIKinds.inc"
+#include "clang/Basic/DiagnosticCASKinds.inc"
 // clang-format on
 #undef DIAG
 };
@@ -179,8 +179,8 @@ VALIDATE_DIAG_SIZE(CROSSTU)
 VALIDATE_DIAG_SIZE(SEMA)
 VALIDATE_DIAG_SIZE(ANALYSIS)
 VALIDATE_DIAG_SIZE(REFACTORING)
-VALIDATE_DIAG_SIZE(CAS)
 VALIDATE_DIAG_SIZE(INSTALLAPI)
+VALIDATE_DIAG_SIZE(CAS)
 #undef VALIDATE_DIAG_SIZE
 #undef STRINGIFY_NAME
 
@@ -212,8 +212,8 @@ const StaticDiagInfoRec StaticDiagInfo[] = {
 #include "clang/Basic/DiagnosticSemaKinds.inc"
 #include "clang/Basic/DiagnosticAnalysisKinds.inc"
 #include "clang/Basic/DiagnosticRefactoringKinds.inc"
-#include "clang/Basic/DiagnosticCASKinds.inc"
 #include "clang/Basic/DiagnosticInstallAPIKinds.inc"
+#include "clang/Basic/DiagnosticCASKinds.inc"
 // clang-format on
 #undef DIAG
 };
@@ -256,8 +256,8 @@ CATEGORY(CROSSTU, COMMENT)
 CATEGORY(SEMA, CROSSTU)
 CATEGORY(ANALYSIS, SEMA)
 CATEGORY(REFACTORING, ANALYSIS)
-CATEGORY(CAS, REFACTORING)
 CATEGORY(INSTALLAPI, REFACTORING)
+CATEGORY(CAS, INSTALLAPI)
 #undef CATEGORY
 
   // Avoid out of bounds reads.

clang/tools/clang-installapi/ClangInstallAPI.cpp

@@ -126,6 +126,10 @@ static bool run(ArrayRef<const char *> Args, const char *ProgName) {
     }
   }
 
+  if (Ctx.Verifier->getState() == DylibVerifier::Result::Invalid)
+    return EXIT_FAILURE;
+
+  // After symbols have been collected, prepare to write output.
   llvm::vfs::OnDiskOutputBackend Backend;
   std::optional<llvm::vfs::OutputFile> Out = llvm::expectedToOptional(
       Backend.createFile(Ctx.OutputLoc, llvm::vfs::OutputConfig()
@@ -146,14 +150,15 @@ static bool run(ArrayRef<const char *> Args, const char *ProgName) {
 
   // Write output file and perform CI cleanup.
   if (auto Err = TextAPIWriter::writeToStream(Out->getOS(), IF, Ctx.FT)) {
-    Diag->Report(diag::err_cannot_open_file) << Ctx.OutputLoc;
-    CI->clearOutputFiles(/*EraseFiles=*/true);
+    Diag->Report(diag::err_cannot_write_file)
+        << Ctx.OutputLoc << std::move(Err);
     if (auto Err = Out->discard())
       llvm::consumeError(std::move(Err));
     return EXIT_FAILURE;
   }
   if (auto Err = Out->keep()) {
-    Diag->Report(diag::err_cannot_open_file) << Ctx.OutputLoc << std::move(Err);
+    Diag->Report(diag::err_cannot_write_file)
+        << Ctx.OutputLoc << std::move(Err);
     return EXIT_FAILURE;
   }
   return EXIT_SUCCESS;