diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2015-04-24 15:51:45 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2015-04-24 15:51:45 +0000 |
commit | c08ab8e6e4559b6ba5bc16f70c75da86bd278a4f (patch) | |
tree | 3c1f6055eb6cdfe718ae69a25ccf9371227ac302 /lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp | |
parent | af9fdb9dcfec7fd26dd8085a6311035cd7e863ae (diff) | |
download | bcm5719-llvm-c08ab8e6e4559b6ba5bc16f70c75da86bd278a4f.tar.gz bcm5719-llvm-c08ab8e6e4559b6ba5bc16f70c75da86bd278a4f.zip |
Delete unnecessary generality in loadFile.
loadFile could load mulitple files just because yaml has a feature for
putting multiple documents in one file.
Designing a linker around what yaml can do seems like a bad idea to
me. This patch changes it to read a single file.
There are further improvements to be done to the api and they
will follow shortly.
llvm-svn: 235724
Diffstat (limited to 'lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp')
-rw-r--r-- | lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp index 9b5837cd45f..aff6c87c894 100644 --- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp +++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp @@ -623,9 +623,11 @@ MachODylibFile* MachOLinkingContext::loadIndirectDylib(StringRef path) { if (mbOrErr.getError()) return nullptr; - std::vector<std::unique_ptr<File>> files; - if (registry().loadFile(std::move(mbOrErr.get()), files)) + std::unique_ptr<File> file; + if (registry().loadFile(std::move(mbOrErr.get()), file)) return nullptr; + std::vector<std::unique_ptr<File>> files; + files.push_back(std::move(file)); assert(files.size() == 1 && "expected one file in dylib"); files[0]->parse(); MachODylibFile* result = reinterpret_cast<MachODylibFile*>(files[0].get()); |