Cleanup

Author: speednoisemovement

lld/MachO/InputFiles.cpp

@@ -2169,12 +2169,8 @@ void ArchiveFile::addLazySymbols() {
       // Check `seen` but don't insert so a future eager load can still happen.
       if (seen.contains(c.getChildOffset()))
         continue;
-      if (!seenLazy.insert(c.getChildOffset()).second) {
+      if (!seenLazy.insert(c.getChildOffset()).second)
         continue;
-      }
-      // First check seen.
-      // Then, write to and check seenLazy
-      // Then, get the file, check for error, and add it to inputs.
       auto file = childToObjectFile(c, /*lazy=*/true);
       if (!file)
         error(toString(this) +
@@ -2235,8 +2231,7 @@ loadArchiveMember(MemoryBufferRef mb, uint32_t modTime, StringRef archiveName,
   }
 }
 
-Error ArchiveFile::fetch(const object::Archive::Child &c, StringRef reason,
-                         bool lazy) {
+Error ArchiveFile::fetch(const object::Archive::Child &c, StringRef reason) {
   if (!seen.insert(c.getChildOffset()).second)
     return Error::success();
   auto file = childToObjectFile(c, /*lazy=*/false);
@@ -2277,10 +2272,8 @@ ArchiveFile::childToObjectFile(const llvm::object::Archive::Child &c,
   if (!modTime)
     return modTime.takeError();
 
-  Expected<InputFile *> file =
-      loadArchiveMember(*mb, toTimeT(*modTime), getName(), c.getChildOffset(),
-                        forceHidden, compatArch, lazy);
-  return file;
+  return loadArchiveMember(*mb, toTimeT(*modTime), getName(),
+                           c.getChildOffset(), forceHidden, compatArch, lazy);
 }
 
 static macho::Symbol *createBitcodeSymbol(const lto::InputFile::Symbol &objSym,

lld/MachO/InputFiles.h

@@ -292,8 +292,7 @@ class ArchiveFile final : public InputFile {
   void fetch(const llvm::object::Archive::Symbol &);
   // LLD normally doesn't use Error for error-handling, but the underlying
   // Archive library does, so this is the cleanest way to wrap it.
-  Error fetch(const llvm::object::Archive::Child &, StringRef reason,
-              bool lazy = false);
+  Error fetch(const llvm::object::Archive::Child &, StringRef reason);
   const llvm::object::Archive &getArchive() const { return *file; };
   static bool classof(const InputFile *f) { return f->kind() == ArchiveKind; }
 

lld/test/MachO/archive-no-index.s

@@ -6,6 +6,10 @@
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos -o %t/lib2.o %t/lib2.s
 # RUN: llvm-ar crST %t/lib.a %t/lib.o %t/lib2.o
 # RUN: %lld %t/main.o %t/lib.a -o %t/out
+# RUN: llvm-nm %t/out | FileCheck %s
+
+# CHECK-NOT: T _bar
+# CHECK:     T _foo
 
 ## Test that every kind of eager load mechanism still works.
 # RUN: %lld %t/main.o %t/lib.a -all_load -o %t/all_load
@@ -36,4 +40,4 @@ _bar:
 _main:
     call _foo    
     mov $0, %rax
-    ret
+    ret