diff options
| author | Rui Ueyama <ruiu@google.com> | 2013-11-13 03:30:29 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2013-11-13 03:30:29 +0000 |
| commit | e20474d38c7ccb322c284e069c12a432c65d9f46 (patch) | |
| tree | d3265299ef4417b4bdfb4bcd0d084cbf37e280e0 | |
| parent | 2235bff2b916eb1564e17b39880687a19aaf50f3 (diff) | |
| download | bcm5719-llvm-e20474d38c7ccb322c284e069c12a432c65d9f46.tar.gz bcm5719-llvm-e20474d38c7ccb322c284e069c12a432c65d9f46.zip | |
Revert "Use empty() instead of size() == 0."
This reverts commit r194551 because it broke the buildbot.
llvm-svn: 194552
| -rw-r--r-- | lld/lib/Core/Resolver.cpp | 2 | ||||
| -rw-r--r-- | lld/lib/Driver/InputGraph.cpp | 4 | ||||
| -rw-r--r-- | lld/lib/Driver/WinLinkDriver.cpp | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/SectionChunks.h | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/MachO/StubsPass.hpp | 2 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp index d5531c26247..3af0c5cba71 100644 --- a/lld/lib/Core/Resolver.cpp +++ b/lld/lib/Core/Resolver.cpp @@ -227,7 +227,7 @@ void Resolver::doDefinedAtom(const DefinedAtom &atom) { switch ( atom.sectionPosition() ) { case DefinedAtom::sectionPositionStart: case DefinedAtom::sectionPositionEnd: - assert(atom.empty()); + assert(atom.size() == 0); break; case DefinedAtom::sectionPositionEarly: case DefinedAtom::sectionPositionAny: diff --git a/lld/lib/Driver/InputGraph.cpp b/lld/lib/Driver/InputGraph.cpp index 3f464618c9b..be7fea0c18c 100644 --- a/lld/lib/Driver/InputGraph.cpp +++ b/lld/lib/Driver/InputGraph.cpp @@ -133,7 +133,7 @@ uint32_t ControlNode::getResolveState() const { /// \brief Set the resolve state for the current element /// thats processed by the resolver. void ControlNode::setResolveState(uint32_t resolveState) { - if (_elements.empty()) + if (_elements.size() == 0) return; _elements[_currentElementIndex]->setResolveState(resolveState); } @@ -151,7 +151,7 @@ SimpleFileNode::SimpleFileNode(StringRef path, int64_t ordinal) /// of the input elements contained in the group. ErrorOr<File &> Group::getNextFile() { // If there are no elements, move on to the next input element - if (_elements.empty()) + if (_elements.size() == 0) return make_error_code(InputGraphError::no_more_files); for (;;) { diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp index 35cf6dd10d0..9f692c1942b 100644 --- a/lld/lib/Driver/WinLinkDriver.cpp +++ b/lld/lib/Driver/WinLinkDriver.cpp @@ -911,7 +911,7 @@ WinLinkDriver::parse(int argc, const char *argv[], PECOFFLinkingContext &ctx, } } - if (inputElements.empty() && !isReadingDirectiveSection) { + if (inputElements.size() == 0 && !isReadingDirectiveSection) { diagnostics << "No input files\n"; return false; } diff --git a/lld/lib/ReaderWriter/ELF/SectionChunks.h b/lld/lib/ReaderWriter/ELF/SectionChunks.h index 992db5c8daf..0a0663ba882 100644 --- a/lld/lib/ReaderWriter/ELF/SectionChunks.h +++ b/lld/lib/ReaderWriter/ELF/SectionChunks.h @@ -576,7 +576,7 @@ StringTable<ELFT>::StringTable(const ELFLinkingContext &context, template <class ELFT> uint64_t StringTable<ELFT>::addString(StringRef symname) { - if (symname.empty()) + if (symname.size() == 0) return 0; StringMapTIter stringIter = _stringMap.find(symname); if (stringIter == _stringMap.end()) { diff --git a/lld/lib/ReaderWriter/MachO/StubsPass.hpp b/lld/lib/ReaderWriter/MachO/StubsPass.hpp index 83afd7b1f1a..a478b9e9794 100644 --- a/lld/lib/ReaderWriter/MachO/StubsPass.hpp +++ b/lld/lib/ReaderWriter/MachO/StubsPass.hpp @@ -123,7 +123,7 @@ public: virtual void addStubAtoms(MutableFile &mergedFile) { // Exit early if no stubs needed. - if (_targetToStub.empty()) + if ( _targetToStub.size() == 0 ) return; // Add all stubs to master file. for (auto it : _targetToStub) { diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp index 40bf988a987..9d7bbca89d6 100644 --- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp +++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp @@ -666,7 +666,7 @@ private: array = array.slice(3); } - if (array.empty()) + if (array.size() == 0) return ""; size_t len = 0; |

