[SOL] Fix bug in LLD

Signed-off-by: Lucas Steuernagel <[email protected]>
LucasSte · Jan 30, 2024 · ab276f3 · ab276f3
1 parent 2cd201e
commit ab276f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/lld/Common/ErrorHandler.cpp b/lld/Common/ErrorHandler.cpp
@@ -51,6 +51,12 @@ void ErrorHandler::flushStreams() {
   errs().flush();
 }
 
+void ErrorHandler::handleEarlyExit() {
+  if (!exitEarly) {
+    cleanupCallback();
+  }
+}
+
 ErrorHandler &lld::errorHandler() { return context().e; }
 
 void lld::error(const Twine &msg) { errorHandler().error(msg); }

diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
@@ -154,6 +154,7 @@ bool link(ArrayRef<const char *> args, llvm::raw_ostream &stdoutOS,
 
   elf::ctx.driver.linkerMain(args);
 
+  ctx->e.handleEarlyExit();
   return errorCount() == 0;
 }
 } // namespace elf

diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp
@@ -1968,6 +1968,7 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
     for (const auto &warning : missingAutolinkWarnings)
       warn(warning);
 
+  ctx->e.handleEarlyExit();
   return errorCount() == 0;
 }
 } // namespace macho

diff --git a/lld/include/lld/Common/ErrorHandler.h b/lld/include/lld/Common/ErrorHandler.h
@@ -117,6 +117,7 @@ class ErrorHandler {
   raw_ostream &outs();
   raw_ostream &errs();
   void flushStreams();
+  void handleEarlyExit();
 
   std::unique_ptr<llvm::FileOutputBuffer> outputBuffer;