[lld] r231271 - Remove "inline" from inlined functions.
Rui Ueyama
ruiu at google.com
Wed Mar 4 10:51:19 PST 2015
Author: ruiu
Date: Wed Mar 4 12:51:19 2015
New Revision: 231271
URL: http://llvm.org/viewvc/llvm-project?rev=231271&view=rev
Log:
Remove "inline" from inlined functions.
Modified:
lld/trunk/include/lld/Core/AbsoluteAtom.h
lld/trunk/include/lld/Core/ArchiveLibraryFile.h
lld/trunk/include/lld/Core/Atom.h
lld/trunk/include/lld/Core/DefinedAtom.h
lld/trunk/include/lld/Core/Node.h
lld/trunk/include/lld/Core/SharedLibraryAtom.h
lld/trunk/include/lld/Core/SharedLibraryFile.h
lld/trunk/include/lld/Core/UndefinedAtom.h
lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h
lld/trunk/lib/ReaderWriter/ELF/HeaderChunks.h
lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h
lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h
Modified: lld/trunk/include/lld/Core/AbsoluteAtom.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/AbsoluteAtom.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/AbsoluteAtom.h (original)
+++ lld/trunk/include/lld/Core/AbsoluteAtom.h Wed Mar 4 12:51:19 2015
@@ -28,10 +28,11 @@ public:
/// by the OS loader.
virtual Scope scope() const = 0;
- static inline bool classof(const Atom *a) {
+ static bool classof(const Atom *a) {
return a->definition() == definitionAbsolute;
}
- static inline bool classof(const AbsoluteAtom *) { return true; }
+
+ static bool classof(const AbsoluteAtom *) { return true; }
protected:
AbsoluteAtom() : Atom(definitionAbsolute) {}
Modified: lld/trunk/include/lld/Core/ArchiveLibraryFile.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/ArchiveLibraryFile.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/ArchiveLibraryFile.h (original)
+++ lld/trunk/include/lld/Core/ArchiveLibraryFile.h Wed Mar 4 12:51:19 2015
@@ -27,7 +27,7 @@ namespace lld {
///
class ArchiveLibraryFile : public File {
public:
- static inline bool classof(const File *f) {
+ static bool classof(const File *f) {
return f->kind() == kindArchiveLibrary;
}
Modified: lld/trunk/include/lld/Core/Atom.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Atom.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Atom.h (original)
+++ lld/trunk/include/lld/Core/Atom.h Wed Mar 4 12:51:19 2015
@@ -55,7 +55,7 @@ public:
/// symbol.
Definition definition() const { return _definition; }
- static inline bool classof(const Atom *a) { return true; }
+ static bool classof(const Atom *a) { return true; }
protected:
/// Atom is an abstract base class. Only subclasses can access constructor.
Modified: lld/trunk/include/lld/Core/DefinedAtom.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/DefinedAtom.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/DefinedAtom.h (original)
+++ lld/trunk/include/lld/Core/DefinedAtom.h Wed Mar 4 12:51:19 2015
@@ -325,7 +325,7 @@ public:
/// \brief Returns an iterator to the end of this Atom's References.
virtual reference_iterator end() const = 0;
- static inline bool classof(const Atom *a) {
+ static bool classof(const Atom *a) {
return a->definition() == definitionRegular;
}
Modified: lld/trunk/include/lld/Core/Node.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/Node.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/Node.h (original)
+++ lld/trunk/include/lld/Core/Node.h Wed Mar 4 12:51:19 2015
@@ -45,7 +45,7 @@ public:
int getSize() const { return _size; }
- static inline bool classof(const Node *a) {
+ static bool classof(const Node *a) {
return a->kind() == Kind::GroupEnd;
}
@@ -59,7 +59,7 @@ public:
explicit FileNode(std::unique_ptr<File> f)
: Node(Node::Kind::File), _file(std::move(f)), _asNeeded(false) {}
- static inline bool classof(const Node *a) {
+ static bool classof(const Node *a) {
return a->kind() == Node::Kind::File;
}
Modified: lld/trunk/include/lld/Core/SharedLibraryAtom.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/SharedLibraryAtom.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/SharedLibraryAtom.h (original)
+++ lld/trunk/include/lld/Core/SharedLibraryAtom.h Wed Mar 4 12:51:19 2015
@@ -38,9 +38,10 @@ public:
virtual uint64_t size() const = 0;
- static inline bool classof(const Atom *a) {
+ static bool classof(const Atom *a) {
return a->definition() == definitionSharedLibrary;
}
+
static inline bool classof(const SharedLibraryAtom *) { return true; }
protected:
Modified: lld/trunk/include/lld/Core/SharedLibraryFile.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/SharedLibraryFile.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/SharedLibraryFile.h (original)
+++ lld/trunk/include/lld/Core/SharedLibraryFile.h Wed Mar 4 12:51:19 2015
@@ -22,7 +22,7 @@ class SharedLibraryFile : public File {
public:
virtual ~SharedLibraryFile() {}
- static inline bool classof(const File *f) {
+ static bool classof(const File *f) {
return f->kind() == kindSharedLibrary;
}
Modified: lld/trunk/include/lld/Core/UndefinedAtom.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Core/UndefinedAtom.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/Core/UndefinedAtom.h (original)
+++ lld/trunk/include/lld/Core/UndefinedAtom.h Wed Mar 4 12:51:19 2015
@@ -51,10 +51,11 @@ public:
virtual CanBeNull canBeNull() const = 0;
- static inline bool classof(const Atom *a) {
+ static bool classof(const Atom *a) {
return a->definition() == definitionUndefined;
}
- static inline bool classof(const UndefinedAtom *) { return true; }
+
+ static bool classof(const UndefinedAtom *) { return true; }
/// Returns an undefined atom if this undefined symbol has a synonym. This is
/// mainly used in COFF. In COFF, an unresolved external symbol can have up to
Modified: lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h (original)
+++ lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h Wed Mar 4 12:51:19 2015
@@ -87,7 +87,7 @@ public:
raw_ostream &);
/// \brief Casting support
- static inline bool classof(const LinkingContext *info) { return true; }
+ static bool classof(const LinkingContext *info) { return true; }
Writer &writer() const override;
bool validateImpl(raw_ostream &diagnostics) override;
Modified: lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h Wed Mar 4 12:51:19 2015
@@ -221,25 +221,22 @@ public:
void assignFileOffsetsForMiscSections();
- /// Inline functions
- inline range<AbsoluteAtomIterT> absoluteAtoms() { return _absoluteAtoms; }
+ range<AbsoluteAtomIterT> absoluteAtoms() { return _absoluteAtoms; }
- inline void addSection(Chunk<ELFT> *c) {
- _sections.push_back(c);
- }
+ void addSection(Chunk<ELFT> *c) { _sections.push_back(c); }
- inline void finalize() {
+ void finalize() {
ScopedTask task(getDefaultDomain(), "Finalize layout");
for (auto &si : _sections)
si->finalize();
}
- inline void doPreFlight() {
+ void doPreFlight() {
for (auto &si : _sections)
si->doPreFlight();
}
- inline const AtomLayout *findAtomLayoutByName(StringRef name) const override {
+ const AtomLayout *findAtomLayoutByName(StringRef name) const override {
for (auto sec : _sections)
if (auto section = dyn_cast<Section<ELFT>>(sec))
if (auto *al = section->findAtomLayoutByName(name))
@@ -247,19 +244,19 @@ public:
return nullptr;
}
- inline void setHeader(ELFHeader<ELFT> *elfHeader) { _elfHeader = elfHeader; }
+ void setHeader(ELFHeader<ELFT> *elfHeader) { _elfHeader = elfHeader; }
- inline void setProgramHeader(ProgramHeader<ELFT> *p) {
+ void setProgramHeader(ProgramHeader<ELFT> *p) {
_programHeader = p;
}
- inline range<OutputSectionIter> outputSections() { return _outputSections; }
+ range<OutputSectionIter> outputSections() { return _outputSections; }
- inline range<ChunkIter> sections() { return _sections; }
+ range<ChunkIter> sections() { return _sections; }
- inline range<SegmentIter> segments() { return _segments; }
+ range<SegmentIter> segments() { return _segments; }
- inline ELFHeader<ELFT> *getHeader() { return _elfHeader; }
+ ELFHeader<ELFT> *getHeader() { return _elfHeader; }
bool hasDynamicRelocationTable() const { return !!_dynamicRelocationTable; }
Modified: lld/trunk/lib/ReaderWriter/ELF/HeaderChunks.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/HeaderChunks.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/HeaderChunks.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/HeaderChunks.h Wed Mar 4 12:51:19 2015
@@ -45,11 +45,11 @@ public:
void e_shstrndx(uint16_t shstrndx) { _eh.e_shstrndx = shstrndx; }
uint64_t fileSize() const { return sizeof(Elf_Ehdr); }
- static inline bool classof(const Chunk<ELFT> *c) {
+ static bool classof(const Chunk<ELFT> *c) {
return c->Kind() == Chunk<ELFT>::Kind::ELFHeader;
}
- inline int getContentType() const { return Chunk<ELFT>::ContentType::Header; }
+ int getContentType() const { return Chunk<ELFT>::ContentType::Header; }
void write(ELFWriter *writer, TargetLayout<ELFT> &layout,
llvm::FileOutputBuffer &buffer);
@@ -136,7 +136,7 @@ public:
uint64_t fileSize() const { return sizeof(Elf_Phdr) * _ph.size(); }
- static inline bool classof(const Chunk<ELFT> *c) {
+ static bool classof(const Chunk<ELFT> *c) {
return c->Kind() == Chunk<ELFT>::Kind::ProgramHeader;
}
@@ -172,7 +172,7 @@ public:
return _ph.size();
}
- inline int getContentType() const { return Chunk<ELFT>::ContentType::Header; }
+ int getContentType() const { return Chunk<ELFT>::ContentType::Header; }
private:
Elf_Phdr *allocateProgramHeader(bool &allocatedNew) {
@@ -270,7 +270,7 @@ public:
void updateSection(Section<ELFT> *section);
- static inline bool classof(const Chunk<ELFT> *c) {
+ static bool classof(const Chunk<ELFT> *c) {
return c->getChunkKind() == Chunk<ELFT>::Kind::SectionHeader;
}
@@ -287,15 +287,11 @@ public:
uint64_t fileSize() const { return sizeof(Elf_Shdr) * _sectionInfo.size(); }
- inline uint64_t entsize() {
- return sizeof(Elf_Shdr);
- }
+ uint64_t entsize() { return sizeof(Elf_Shdr); }
- inline int getContentType() const { return Chunk<ELFT>::ContentType::Header; }
+ int getContentType() const { return Chunk<ELFT>::ContentType::Header; }
- inline uint64_t numHeaders() {
- return _sectionInfo.size();
- }
+ uint64_t numHeaders() { return _sectionInfo.size(); }
private:
StringTable<ELFT> *_stringSection;
Modified: lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h Wed Mar 4 12:51:19 2015
@@ -248,9 +248,7 @@ public:
}
/// \brief Return the raw flags, we need this to sort segments
- inline int64_t atomflags() const {
- return _contentPermissions;
- }
+ int64_t atomflags() const { return _contentPermissions; }
/// Atom Iterators
typedef typename std::vector<lld::AtomLayout *>::iterator atom_iter;
@@ -449,39 +447,29 @@ public:
void appendSection(Chunk<ELFT> *c);
// Set the OutputSection is associated with a segment
- inline void setHasSegment() { _hasSegment = true; }
+ void setHasSegment() { _hasSegment = true; }
/// Sets the ordinal
- inline void setOrdinal(uint64_t ordinal) {
- _ordinal = ordinal;
- }
+ void setOrdinal(uint64_t ordinal) { _ordinal = ordinal; }
/// Sets the Memory size
- inline void setMemSize(uint64_t memsz) {
- _memSize = memsz;
- }
+ void setMemSize(uint64_t memsz) { _memSize = memsz; }
/// Sets the size fo the output Section.
- inline void setSize(uint64_t fsiz) {
- _size = fsiz;
- }
+ void setSize(uint64_t fsiz) { _size = fsiz; }
// The offset of the first section contained in the output section is
// contained here.
- inline void setFileOffset(uint64_t foffset) {
- _fileOffset = foffset;
- }
+ void setFileOffset(uint64_t foffset) { _fileOffset = foffset; }
// Sets the starting address of the section
- inline void setAddr(uint64_t addr) {
- _virtualAddr = addr;
- }
+ void setAddr(uint64_t addr) { _virtualAddr = addr; }
// Is the section loadable?
- inline bool isLoadableSection() const { return _isLoadableSection; }
+ bool isLoadableSection() const { return _isLoadableSection; }
// Set section Loadable
- inline void setLoadableSection(bool isLoadable) {
+ void setLoadableSection(bool isLoadable) {
_isLoadableSection = isLoadable;
}
@@ -493,36 +481,36 @@ public:
void setType(int16_t type) { _type = type; }
- inline range<ChunkIter> sections() { return _sections; }
+ range<ChunkIter> sections() { return _sections; }
// The below functions returns the properties of the OutputSection.
- inline bool hasSegment() const { return _hasSegment; }
+ bool hasSegment() const { return _hasSegment; }
- inline StringRef name() const { return _name; }
+ StringRef name() const { return _name; }
- inline int64_t shinfo() const { return _shInfo; }
+ int64_t shinfo() const { return _shInfo; }
- inline uint64_t alignment() const { return _alignment; }
+ uint64_t alignment() const { return _alignment; }
- inline int64_t link() const { return _link; }
+ int64_t link() const { return _link; }
- inline int64_t type() const { return _type; }
+ int64_t type() const { return _type; }
- inline uint64_t virtualAddr() const { return _virtualAddr; }
+ uint64_t virtualAddr() const { return _virtualAddr; }
- inline int64_t ordinal() const { return _ordinal; }
+ int64_t ordinal() const { return _ordinal; }
- inline int64_t kind() const { return _kind; }
+ int64_t kind() const { return _kind; }
- inline uint64_t fileSize() const { return _size; }
+ uint64_t fileSize() const { return _size; }
- inline int64_t entsize() const { return _entSize; }
+ int64_t entsize() const { return _entSize; }
- inline uint64_t fileOffset() const { return _fileOffset; }
+ uint64_t fileOffset() const { return _fileOffset; }
- inline int64_t flags() const { return _flags; }
+ int64_t flags() const { return _flags; }
- inline uint64_t memSize() { return _memSize; }
+ uint64_t memSize() { return _memSize; }
private:
StringRef _name;
@@ -579,9 +567,7 @@ public:
virtual void write(ELFWriter *writer, TargetLayout<ELFT> &layout,
llvm::FileOutputBuffer &buffer);
- inline void setNumEntries(int64_t numEntries) {
- _stringMap.resize(numEntries);
- }
+ void setNumEntries(int64_t numEntries) { _stringMap.resize(numEntries); }
private:
std::vector<StringRef> _strings;
Modified: lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h?rev=231271&r1=231270&r2=231271&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h Wed Mar 4 12:51:19 2015
@@ -45,45 +45,41 @@ public:
// Set the segment slice start and end iterators. This is used to walk through
// the sections that are part of the Segment slice
- inline void setSections(range<SectionIter> sections) {
- _sections = sections;
- }
+ void setSections(range<SectionIter> sections) { _sections = sections; }
// Return the fileOffset of the slice
- inline uint64_t fileOffset() const { return _offset; }
+ uint64_t fileOffset() const { return _offset; }
void setFileOffset(uint64_t offset) { _offset = offset; }
// Return the size of the slice
- inline uint64_t fileSize() const { return _fsize; }
+ uint64_t fileSize() const { return _fsize; }
void setFileSize(uint64_t filesz) { _fsize = filesz; }
// Return the start of the slice
- inline int32_t startSection() const { return _startSection; }
+ int32_t startSection() const { return _startSection; }
// Return the start address of the slice
- inline uint64_t virtualAddr() const { return _addr; }
+ uint64_t virtualAddr() const { return _addr; }
// Return the memory size of the slice
- inline uint64_t memSize() const { return _memSize; }
+ uint64_t memSize() const { return _memSize; }
// Return the alignment of the slice
- inline uint64_t alignment() const { return _alignment; }
+ uint64_t alignment() const { return _alignment; }
- inline void setMemSize(uint64_t memsz) { _memSize = memsz; }
+ void setMemSize(uint64_t memsz) { _memSize = memsz; }
- inline void setVirtualAddr(uint64_t addr) { _addr = addr; }
+ void setVirtualAddr(uint64_t addr) { _addr = addr; }
- inline void setAlign(uint64_t align) { _alignment = align; }
+ void setAlign(uint64_t align) { _alignment = align; }
static bool compare_slices(SegmentSlice<ELFT> *a, SegmentSlice<ELFT> *b) {
return a->startSection() < b->startSection();
}
- inline range<SectionIter> sections() {
- return _sections;
- }
+ range<SectionIter> sections() { return _sections; }
private:
range<SectionIter> _sections;
@@ -162,11 +158,11 @@ public:
}
/// Finalize the segment before assigning File Offsets / Virtual addresses
- inline void doPreFlight() {}
+ void doPreFlight() {}
/// Finalize the segment, before we want to write the segment header
/// information
- inline void finalize() {
+ void finalize() {
// We want to finalize the segment values for now only for non loadable
// segments, since those values are not set in the Layout
if (_segmentType == llvm::ELF::PT_LOAD)
@@ -185,17 +181,15 @@ public:
}
// For LLVM RTTI
- static inline bool classof(const Chunk<ELFT> *c) {
+ static bool classof(const Chunk<ELFT> *c) {
return c->kind() == Chunk<ELFT>::Kind::ELFSegment;
}
// Getters
- inline int32_t sectionCount() const {
- return _sections.size();
- }
+ int32_t sectionCount() const { return _sections.size(); }
/// \brief, this function returns the type of segment (PT_*)
- inline Layout::SegmentType segmentType() { return _segmentType; }
+ Layout::SegmentType segmentType() { return _segmentType; }
/// \brief return the segment type depending on the content,
/// If the content corresponds to Code, this will return Segment::Code
@@ -219,11 +213,11 @@ public:
}
}
- inline int pageSize() const { return this->_context.getPageSize(); }
+ int pageSize() const { return this->_context.getPageSize(); }
- inline int rawflags() const { return _atomflags; }
+ int rawflags() const { return _atomflags; }
- inline int64_t atomflags() const {
+ int64_t atomflags() const {
switch (_atomflags) {
case DefinedAtom::permUnknown:
@@ -250,9 +244,9 @@ public:
}
}
- inline int64_t numSlices() const { return _segmentSlices.size(); }
+ int64_t numSlices() const { return _segmentSlices.size(); }
- inline range<SliceIter> slices() { return _segmentSlices; }
+ range<SliceIter> slices() { return _segmentSlices; }
Chunk<ELFT> *firstSection() { return _sections[0]; }
@@ -294,7 +288,7 @@ public:
/// Finalize the segment, before we want to write the segment header
/// information
- inline void finalize() {
+ void finalize() {
// If the segment is of type Program Header, then the values fileOffset
// and the fileSize need to be picked up from the last section, the first
// section points to the ELF header and the second chunk points to the
More information about the llvm-commits
mailing list