[PATCH] D145273: [lld-macho] Avoid running LTO pipeline for no files

[Keith Smiley via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGa65678b35bbc: [lld-macho] Avoid running LTO pipeline for no files (authored by keith).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D145273/new/

https://reviews.llvm.org/D145273

Files:
  lld/MachO/LTO.cpp
  lld/MachO/LTO.h
  lld/test/MachO/lto-object-path.ll


Index: lld/test/MachO/lto-object-path.ll
===================================================================
--- lld/test/MachO/lto-object-path.ll
+++ lld/test/MachO/lto-object-path.ll
@@ -2,12 +2,16 @@
 ; UNSUPPORTED: system-windows
 
 ; RUN: rm -rf %t; mkdir %t
+; RUN: llc -filetype=obj %s -o %t/test-obj.o
 ; RUN: opt -thinlto-bc %s -o %t/test.o
 ; RUN: opt %s -o %t/test-nonthin.o
 
 ; RUN: %lld %t/test.o -o %t/test
 ; RUN: llvm-nm -pa %t/test | FileCheck %s --check-prefixes CHECK,NOOBJPATH
 
+; RUN: %lld %t/test-obj.o -o %t/test-obj -object_path_lto %t/lto-temps-obj
+; RUN: llvm-nm -pa %t/test-obj | FileCheck %s --check-prefixes CHECK,NOLTOFILES -DDIR=%t
+
 ; RUN: ZERO_AR_DATE=0 %lld %t/test.o -o %t/test -object_path_lto %t/lto-temps
 ; RUN: llvm-nm -pa %t/test | FileCheck %s --check-prefixes CHECK,OBJPATH-DIR -DDIR=%t/lto-temps
 
@@ -31,10 +35,12 @@
 ; RUN: touch %t/lto-tmp.o
 ; RUN: ZERO_AR_DATE=0 %lld %t/test-nonthin.o -o %t/test -object_path_lto %t/lto-tmp.o
 ; RUN: llvm-nm -pa %t/test | FileCheck %s --check-prefixes CHECK,OBJPATH-FILE -DFILE=%t/lto-tmp.o
+; RUN: llvm-otool -l %t/lto-tmp.o | FileCheck %s --check-prefixes=MINOS
 
 
 ; CHECK:             0000000000000000                - 00 0000    SO /tmp/test.cpp
 ; NOOBJPATH-NEXT:    0000000000000000                - 03 0001   OSO /tmp/lto.tmp
+; NOLTOFILES-NEXT:   0000000000000000                - 03 0001   OSO [[DIR]]/test-obj.o
 ;; check that modTime is nonzero when `-object_path_lto` is provided
 ; OBJPATH-DIR-NEXT:  {{[0-9a-f]*[1-9a-f]+[0-9a-f]*}} - 03 0001   OSO [[DIR]]/1.x86_64.lto.o
 ; OBJPATH-FILE-NEXT: {{[0-9a-f]*[1-9a-f]+[0-9a-f]*}} - 03 0001   OSO [[FILE]]
@@ -45,6 +51,8 @@
 ; DSYM: DW_AT_name ("test.cpp")
 ; HARDLINK: 2
 
+; MINOS: 10.15
+
 target triple = "x86_64-apple-macosx10.15.0"
 target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 
Index: lld/MachO/LTO.h
===================================================================
--- lld/MachO/LTO.h
+++ lld/MachO/LTO.h
@@ -39,6 +39,7 @@
   std::vector<std::unique_ptr<llvm::MemoryBuffer>> files;
   std::unique_ptr<llvm::raw_fd_ostream> indexFile;
   llvm::DenseSet<StringRef> thinIndices;
+  bool hasFiles = false;
 };
 
 } // namespace lld::macho
Index: lld/MachO/LTO.cpp
===================================================================
--- lld/MachO/LTO.cpp
+++ lld/MachO/LTO.cpp
@@ -160,6 +160,7 @@
     // TODO: set the other resolution configs properly
   }
   checkError(ltoObj->add(std::move(f.obj), resols));
+  hasFiles = true;
 }
 
 // If LazyObjFile has not been added to link, emit empty index files.
@@ -211,12 +212,13 @@
                                files[task] = std::move(mb);
                              }));
 
-  checkError(ltoObj->run(
-      [&](size_t task, const Twine &moduleName) {
-        return std::make_unique<CachedFileStream>(
-            std::make_unique<raw_svector_ostream>(buf[task]));
-      },
-      cache));
+  if (hasFiles)
+    checkError(ltoObj->run(
+        [&](size_t task, const Twine &moduleName) {
+          return std::make_unique<CachedFileStream>(
+              std::make_unique<raw_svector_ostream>(buf[task]));
+        },
+        cache));
 
   // Emit empty index files for non-indexed files
   for (StringRef s : thinIndices) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D145273.502281.patch
Type: text/x-patch
Size: 3290 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230303/87229ef9/attachment.bin>