diff options
| author | Rui Ueyama <ruiu@google.com> | 2015-01-13 18:47:25 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2015-01-13 18:47:25 +0000 |
| commit | 0d31e530958d7593ead3edb30afdc6fe7ebc1cec (patch) | |
| tree | 6e4a59c4e9c9f021ff42c146af41eada09b061da /lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp | |
| parent | 080b1f3055b1f60588deab6839c1e87647b3c284 (diff) | |
| download | bcm5719-llvm-0d31e530958d7593ead3edb30afdc6fe7ebc1cec.tar.gz bcm5719-llvm-0d31e530958d7593ead3edb30afdc6fe7ebc1cec.zip | |
Replace vector<unique_ptr<File> with unique_ptr<File>.
Because each InputElement has exactly one File, we no longer have
to use a vector to store pointers to Files.
llvm-svn: 225814
Diffstat (limited to 'lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp')
| -rw-r--r-- | lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp index 37591d0f546..201d1f85b96 100644 --- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp +++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp @@ -928,9 +928,7 @@ bool MachOLinkingContext::customAtomOrderer(const DefinedAtom *left, static File *getFirstFile(const std::unique_ptr<InputElement> &elem) { FileNode *e = dyn_cast<FileNode>(const_cast<InputElement *>(elem.get())); - if (!e || e->files().empty()) - return nullptr; - return e->files()[0].get(); + return e ? e->getFile() : nullptr; } static bool isLibrary(const std::unique_ptr<InputElement> &elem) { |
