[lld] r238478 - Rename InputFile::Name -> InputFile::Filename.
Rui Ueyama
ruiu at google.com
Thu May 28 13:16:25 PDT 2015
Author: ruiu
Date: Thu May 28 15:16:25 2015
New Revision: 238478
URL: http://llvm.org/viewvc/llvm-project?rev=238478&view=rev
Log:
Rename InputFile::Name -> InputFile::Filename.
Other local variables shadowed the member variable.
Rename to make that a bit longer.
Modified:
lld/trunk/COFF/InputFiles.cpp
lld/trunk/COFF/InputFiles.h
Modified: lld/trunk/COFF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/InputFiles.cpp?rev=238478&r1=238477&r2=238478&view=diff
==============================================================================
--- lld/trunk/COFF/InputFiles.cpp (original)
+++ lld/trunk/COFF/InputFiles.cpp Thu May 28 15:16:25 2015
@@ -47,7 +47,7 @@ std::string InputFile::getShortName() {
std::error_code ArchiveFile::parse() {
// Get a memory buffer.
- auto MBOrErr = MemoryBuffer::getFile(Name);
+ auto MBOrErr = MemoryBuffer::getFile(Filename);
if (auto EC = MBOrErr.getError())
return EC;
MB = std::move(MBOrErr.get());
@@ -91,7 +91,7 @@ ErrorOr<MemoryBufferRef> ArchiveFile::ge
std::error_code ObjectFile::parse() {
// MBRef is not initialized if this is not an archive member.
if (MBRef.getBuffer().empty()) {
- auto MBOrErr = MemoryBuffer::getFile(Name);
+ auto MBOrErr = MemoryBuffer::getFile(Filename);
if (auto EC = MBOrErr.getError())
return EC;
MB = std::move(MBOrErr.get());
@@ -108,7 +108,7 @@ std::error_code ObjectFile::parse() {
Bin.release();
COFFObj.reset(Obj);
} else {
- return make_dynamic_error_code(Twine(Name) + " is not a COFF file.");
+ return make_dynamic_error_code(Twine(Filename) + " is not a COFF file.");
}
// Read section and symbol tables.
@@ -160,14 +160,14 @@ std::error_code ObjectFile::initializeSy
// Get a COFFSymbolRef object.
auto SymOrErr = COFFObj->getSymbol(I);
if (auto EC = SymOrErr.getError())
- return make_dynamic_error_code(Twine("broken object file: ") + Name +
+ return make_dynamic_error_code(Twine("broken object file: ") + Filename +
": " + EC.message());
COFFSymbolRef Sym = SymOrErr.get();
// Get a symbol name.
StringRef SymbolName;
if (auto EC = COFFObj->getSymbolName(Sym, SymbolName))
- return make_dynamic_error_code(Twine("broken object file: ") + Name +
+ return make_dynamic_error_code(Twine("broken object file: ") + Filename +
": " + EC.message());
// Skip special symbols.
if (SymbolName == "@comp.id" || SymbolName == "@feat.00")
Modified: lld/trunk/COFF/InputFiles.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/InputFiles.h?rev=238478&r1=238477&r2=238478&view=diff
==============================================================================
--- lld/trunk/COFF/InputFiles.h (original)
+++ lld/trunk/COFF/InputFiles.h Thu May 28 15:16:25 2015
@@ -63,10 +63,10 @@ private:
// .lib or .a file.
class ArchiveFile : public InputFile {
public:
- explicit ArchiveFile(StringRef S) : InputFile(ArchiveKind), Name(S) {}
+ explicit ArchiveFile(StringRef S) : InputFile(ArchiveKind), Filename(S) {}
static bool classof(const InputFile *F) { return F->kind() == ArchiveKind; }
std::error_code parse() override;
- StringRef getName() override { return Name; }
+ StringRef getName() override { return Filename; }
// Returns a memory buffer for a given symbol. An empty memory buffer
// is returned if we have already returned the same memory buffer.
@@ -78,7 +78,7 @@ public:
private:
std::unique_ptr<Archive> File;
- std::string Name;
+ std::string Filename;
std::unique_ptr<MemoryBuffer> MB;
std::vector<SymbolBody *> SymbolBodies;
std::set<const char *> Seen;
@@ -88,13 +88,13 @@ private:
// .obj or .o file. This may be a member of an archive file.
class ObjectFile : public InputFile {
public:
- explicit ObjectFile(StringRef S) : InputFile(ObjectKind), Name(S) {}
+ explicit ObjectFile(StringRef S) : InputFile(ObjectKind), Filename(S) {}
ObjectFile(StringRef S, MemoryBufferRef M)
- : InputFile(ObjectKind), Name(S), MBRef(M) {}
+ : InputFile(ObjectKind), Filename(S), MBRef(M) {}
static bool classof(const InputFile *F) { return F->kind() == ObjectKind; }
std::error_code parse() override;
- StringRef getName() override { return Name; }
+ StringRef getName() override { return Filename; }
std::vector<Chunk *> &getChunks() { return Chunks; }
std::vector<SymbolBody *> &getSymbols() override { return SymbolBodies; }
@@ -115,7 +115,7 @@ private:
SymbolBody *createSymbolBody(StringRef Name, COFFSymbolRef Sym,
const void *Aux, bool IsFirst);
- std::string Name;
+ std::string Filename;
std::unique_ptr<COFFObjectFile> COFFObj;
std::unique_ptr<MemoryBuffer> MB;
MemoryBufferRef MBRef;
More information about the llvm-commits
mailing list