lld matching change for llvm change r308690 to add error handling to

the dyld compact export entries in libObject.

llvm-svn: 308691

1 files changed, 4 insertions, 1 deletions

diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
index b54054726df..2f91818f187 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
@@ -511,7 +511,8 @@ readBinary(std::unique_ptr<MemoryBuffer> &mb,
       const uint8_t *trieStart = reinterpret_cast<const uint8_t *>(
           start + read32(&dyldInfo->export_off, isBig));
       ArrayRef<uint8_t> trie(trieStart, read32(&dyldInfo->export_size, isBig));
-      for (const ExportEntry &trieExport : MachOObjectFile::exports(trie)) {
+      Error Err = Error::success();
+      for (const ExportEntry &trieExport : MachOObjectFile::exports(Err, trie)) {
         Export normExport;
         normExport.name = trieExport.name().copy(f->ownedAllocations);
         normExport.offset = trieExport.address();
@@ -522,6 +523,8 @@ readBinary(std::unique_ptr<MemoryBuffer> &mb,
           normExport.otherName = trieExport.otherName().copy(f->ownedAllocations);
         f->exportInfo.push_back(normExport);
       }
+      if (Err)
+        return std::move(Err);
     }
   }