[llvm] Update MachOObjectFile::exports interface

[alexander-shaposhnikov]

Summary

This diff removes the second argument of the method
MachOObjectFile::exports which was recently introduced in r308690.
In all in-tree uses this argument is equal to "this", additionally
without this argument the interface seems to be cleaner.

Test plan: make check-all

[compnerd]

Does anyone use the overload with the O for exports with nullptr instead of this? If not, we could just inline this throughout.

tools/llvm-nm/llvm-nm.cpp

1230

I think that using auto here instead of llvm::object:ExportEntry is better for readability.

tools/llvm-objdump/MachODump.cpp

9406

Similar.

include/llvm/Object/MachO.h

public:
   dice_iterator begin_dices() const;
   dice_iterator end_dices() const;
 
   load_command_iterator begin_load_commands() const;
   load_command_iterator end_load_commands() const;
   iterator_range<load_command_iterator> load_commands() const;
 
   /// For use iterating over all exported symbols.
-  iterator_range<export_iterator> exports(Error &Err,
-                                          const MachOObjectFile *O) const;
+  iterator_range<export_iterator> exports(Error &Err) const;
 
   /// For use examining a trie not in a MachOObjectFile.
   static iterator_range<export_iterator> exports(Error &Err,
                                                  ArrayRef<uint8_t> Trie,
                                                  const MachOObjectFile *O =
                                                                       nullptr);
 
   /// For use iterating over all rebase table entries.

lib/Object/MachOObjectFile.cpp

else
     Start.moveToFirst();
 
   ExportEntry Finish(&E, O, Trie);
   Finish.moveToEnd();
 
   return make_range(export_iterator(Start), export_iterator(Finish));
 }
 
-iterator_range<export_iterator> MachOObjectFile::exports(Error &Err,
-                                  const MachOObjectFile *O) const {
-  return exports(Err, getDyldInfoExportsTrie(), O);
+iterator_range<export_iterator> MachOObjectFile::exports(Error &Err) const {
+  return exports(Err, getDyldInfoExportsTrie(), this);
 }
 
 MachORebaseEntry::MachORebaseEntry(Error *E, const MachOObjectFile *O,
                                    ArrayRef<uint8_t> Bytes, bool is64Bit)
     : E(E), O(O), Opcodes(Bytes), Ptr(Bytes.begin()),
       PointerSize(is64Bit ? 8 : 4) {}
 
 void MachORebaseEntry::moveToFirst() {

tools/llvm-nm/llvm-nm.cpp

for (const auto &Command : MachO->load_commands()) {
           break;
         }
       }
     }
     if (DyldInfoOnly || AddDyldInfo ||
         HFlags & MachO::MH_NLIST_OUTOFSYNC_WITH_DYLDINFO) {
       unsigned ExportsAdded = 0;
       Error Err = Error::success();
-      for (const llvm::object::ExportEntry &Entry : MachO->exports(Err,
-                                                                   MachO)) {
+      for (const llvm::object::ExportEntry &Entry : MachO->exports(Err)) {
         bool found = false;
         bool ReExport = false;
         if (!DyldInfoOnly) {
           for (unsigned J = 0; J < SymbolList.size() && !found; ++J) {
             if (SymbolList[J].Address == Entry.address() + BaseSegmentAddress &&
                 SymbolList[J].Name == Entry.name())
               found = true;
           }

tools/llvm-objdump/MachODump.cpp

if (Command.C.cmd == MachO::LC_SEGMENT) {
       MachO::segment_command_64 Seg = Obj->getSegment64LoadCommand(Command);
       if (Seg.fileoff == 0 && Seg.filesize != 0) {
         BaseSegmentAddress = Seg.vmaddr;
         break;
       }
     }
   }
   Error Err = Error::success();
-  for (const llvm::object::ExportEntry &Entry : Obj->exports(Err, Obj)) {
+  for (const llvm::object::ExportEntry &Entry : Obj->exports(Err)) {
     uint64_t Flags = Entry.flags();
     bool ReExport = (Flags & MachO::EXPORT_SYMBOL_FLAGS_REEXPORT);
     bool WeakDef = (Flags & MachO::EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION);
     bool ThreadLocal = ((Flags & MachO::EXPORT_SYMBOL_FLAGS_KIND_MASK) ==
                         MachO::EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL);
     bool Abs = ((Flags & MachO::EXPORT_SYMBOL_FLAGS_KIND_MASK) ==
                 MachO::EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE);
     bool Resolver = (Flags & MachO::EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER);