<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, May 5, 2016 at 4:41 PM, Kevin Enderby via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: enderby<br>
Date: Thu May 5 18:41:05 2016<br>
New Revision: 268694<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=268694&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=268694&view=rev</a><br>
Log:<br>
Cleanup and refactor of malformedError() in lib/Object/MachOObjectFile.cpp .<br>
<br>
No functional change.<br>
<br>
Modified:<br>
llvm/trunk/lib/Object/MachOObjectFile.cpp<br>
<br>
Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=268694&r1=268693&r2=268694&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=268694&r1=268693&r2=268694&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)<br>
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Thu May 5 18:41:05 2016<br>
@@ -38,19 +38,12 @@ namespace {<br>
};<br>
}<br>
<br>
-// FIXME: Remove ECOverride once Error has been plumbed down to obj tool code.<br>
static Error<br>
-malformedError(std::string FileName, std::string Msg,<br>
- object_error ECOverride = object_error::parse_failed) {<br>
- return make_error<GenericBinaryError>(std::move(FileName), std::move(Msg),<br>
- ECOverride);<br>
-}<br>
-<br>
-// FIXME: Remove ECOverride once Error has been plumbed down to obj tool code.<br>
-static Error<br>
-malformedError(const MachOObjectFile &Obj, Twine Msg,<br>
- object_error ECOverride = object_error::parse_failed) {<br>
- return malformedError(Obj.getFileName(), Msg.str(), ECOverride);<br>
+malformedError(const MachOObjectFile &Obj, Twine Msg) {<br>
+ std::string StringMsg = "truncated or malformed object (" + Msg.str() + ")";<br></blockquote><div><br></div><div>This might be marginally more efficient if you change the precedence:<br><br>("x" + y + "z").str()<br><br>That way a new buffer won't have to be created (or at least shuffled around) for the ("x" + y) part.<br><br>(also, and I know this one isn't so easy - Twine is mostly useful for cases where the value may never be manifest (eg: diagnostics where the Twine is created, but then some condition is tested and the Twine may never be stringified). So I'd somewhat discourage it's use when that's not the situation - but I know Twine also provides convenience string concatenation, etc, that make it nice to use in places like this. And the above point I made does demonstrate that it has some potential performance benefit here too)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ return make_error<GenericBinaryError>(std::move(Obj.getFileName()),<br>
+ std::move(StringMsg),<br>
+ object_error::parse_failed);<br>
}<br>
<br>
// FIXME: Replace all uses of this function with getStructOrErr.<br>
@@ -181,9 +174,8 @@ getLoadCommandInfo(const MachOObjectFile<br>
uint32_t LoadCommandIndex) {<br>
if (auto CmdOrErr = getStructOrErr<MachO::load_command>(Obj, Ptr)) {<br>
if (CmdOrErr->cmdsize < 8)<br>
- return malformedError(*Obj, Twine("truncated or malformed object (load "<br>
- "command ") + Twine(LoadCommandIndex) +<br>
- Twine(" with size less than 8 bytes)"));<br>
+ return malformedError(*Obj, "load command " + Twine(LoadCommandIndex) +<br>
+ " with size less than 8 bytes");<br>
return MachOObjectFile::LoadCommandInfo({Ptr, *CmdOrErr});<br>
} else<br>
return CmdOrErr.takeError();<br>
@@ -194,9 +186,8 @@ getFirstLoadCommandInfo(const MachOObjec<br>
unsigned HeaderSize = Obj->is64Bit() ? sizeof(MachO::mach_header_64)<br>
: sizeof(MachO::mach_header);<br>
if (sizeof(MachOObjectFile::LoadCommandInfo) > Obj->getHeader().sizeofcmds)<br>
- return malformedError(*Obj, "truncated or malformed object (load command "<br>
- "0 extends past the end all load commands in the "<br>
- "file)");<br>
+ return malformedError(*Obj, "load command 0 extends past the end all load "<br>
+ "commands in the file");<br>
return getLoadCommandInfo(Obj, getPtr(Obj, HeaderSize), 0);<br>
}<br>
<br>
@@ -207,10 +198,8 @@ getNextLoadCommandInfo(const MachOObject<br>
: sizeof(MachO::mach_header);<br>
if (L.Ptr + L.C.cmdsize + sizeof(MachOObjectFile::LoadCommandInfo) ><br>
Obj->getData().data() + HeaderSize + Obj->getHeader().sizeofcmds)<br>
- return malformedError(*Obj, Twine("truncated or malformed object "<br>
- "(load command ") + Twine(LoadCommandIndex + 1) +<br>
- Twine(" extends past the end all load commands in the "<br>
- "file)"));<br>
+ return malformedError(*Obj, "load command " + Twine(LoadCommandIndex + 1) +<br>
+ " extends past the end all load commands in the file");<br>
return getLoadCommandInfo(Obj, L.Ptr + L.C.cmdsize, LoadCommandIndex + 1);<br>
}<br>
<br>
@@ -218,8 +207,8 @@ template <typename T><br>
static void parseHeader(const MachOObjectFile *Obj, T &Header,<br>
Error &Err) {<br>
if (sizeof(T) > Obj->getData().size()) {<br>
- Err = malformedError(*Obj, "truncated or malformed object (the mach header "<br>
- "extends past the end of the file)");<br>
+ Err = malformedError(*Obj, "the mach header extends past the end of the "<br>
+ "file");<br>
return;<br>
}<br>
if (auto HeaderOrErr = getStructOrErr<T>(Obj, getPtr(Obj, 0)))<br>
@@ -238,19 +227,17 @@ static Error parseSegmentLoadCommand(<br>
uint32_t LoadCommandIndex, const char *CmdName) {<br>
const unsigned SegmentLoadSize = sizeof(SegmentCmd);<br>
if (Load.C.cmdsize < SegmentLoadSize)<br>
- return malformedError(*Obj, Twine("truncated or malformed object "<br>
- "(load command ") + Twine(LoadCommandIndex) +<br>
- Twine(" ") + CmdName + Twine(" cmdsize too small)"));<br>
+ return malformedError(*Obj, "load command " + Twine(LoadCommandIndex) +<br>
+ " " + CmdName + " cmdsize too small");<br>
if (auto SegOrErr = getStructOrErr<SegmentCmd>(Obj, Load.Ptr)) {<br>
SegmentCmd S = SegOrErr.get();<br>
const unsigned SectionSize =<br>
Obj->is64Bit() ? sizeof(MachO::section_64) : sizeof(MachO::section);<br>
if (S.nsects > std::numeric_limits<uint32_t>::max() / SectionSize ||<br>
S.nsects * SectionSize > Load.C.cmdsize - SegmentLoadSize)<br>
- return malformedError(*Obj, Twine("truncated or malformed object "<br>
- "(load command ") + Twine(LoadCommandIndex) +<br>
- Twine(" inconsistent cmdsize in ") + CmdName +<br>
- Twine(" for the number of sections)"));<br>
+ return malformedError(*Obj, "load command " + Twine(LoadCommandIndex) +<br>
+ " inconsistent cmdsize in " + CmdName +<br>
+ " for the number of sections");<br>
for (unsigned J = 0; J < S.nsects; ++J) {<br>
const char *Sec = getSectionPtr(Obj, Load, J);<br>
Sections.push_back(Sec);<br>
@@ -294,8 +281,7 @@ MachOObjectFile::MachOObjectFile(MemoryB<br>
return;<br>
BigSize += getHeader().sizeofcmds;<br>
if (getData().data() + BigSize > getData().end()) {<br>
- Err = malformedError(getFileName(), "truncated or malformed object "<br>
- "(load commands extend past the end of the file)");<br>
+ Err = malformedError(*this, "load commands extend past the end of the file");<br>
return;<br>
}<br>
<br>
@@ -383,10 +369,8 @@ MachOObjectFile::MachOObjectFile(MemoryB<br>
}<br>
if (!SymtabLoadCmd) {<br>
if (DysymtabLoadCmd) {<br>
- Err = malformedError(*this,<br>
- "truncated or malformed object (contains "<br>
- "LC_DYSYMTAB load command without a LC_SYMTAB load "<br>
- "command)");<br>
+ Err = malformedError(*this, "contains LC_DYSYMTAB load command without a "<br>
+ "LC_SYMTAB load command");<br>
return;<br>
}<br>
} else if (DysymtabLoadCmd) {<br>
@@ -395,51 +379,40 @@ MachOObjectFile::MachOObjectFile(MemoryB<br>
MachO::dysymtab_command Dysymtab =<br>
getStruct<MachO::dysymtab_command>(this, DysymtabLoadCmd);<br>
if (Dysymtab.nlocalsym != 0 && Dysymtab.ilocalsym > Symtab.nsyms) {<br>
- Err = malformedError(*this,<br>
- "truncated or malformed object (iolocalsym in "<br>
- "LC_DYSYMTAB load command extends past the end of "<br>
- "the symbol table)");<br>
+ Err = malformedError(*this, "ilocalsym in LC_DYSYMTAB load command "<br>
+ "extends past the end of the symbol table");<br>
return;<br>
}<br>
uint64_t BigSize = Dysymtab.ilocalsym;<br>
BigSize += Dysymtab.nlocalsym;<br>
if (Dysymtab.nlocalsym != 0 && BigSize > Symtab.nsyms) {<br>
- Err = malformedError(*this,<br>
- "truncated or malformed object (ilocalsym plus "<br>
- "nlocalsym in LC_DYSYMTAB load command extends past "<br>
- "the end of the symbol table)");<br>
+ Err = malformedError(*this, "ilocalsym plus nlocalsym in LC_DYSYMTAB load "<br>
+ "command extends past the end of the symbol table");<br>
return;<br>
}<br>
if (Dysymtab.nextdefsym != 0 && Dysymtab.ilocalsym > Symtab.nsyms) {<br>
- Err = malformedError(*this,<br>
- "truncated or malformed object (nextdefsym in "<br>
- "LC_DYSYMTAB load command extends past the end of "<br>
- "the symbol table)");<br>
+ Err = malformedError(*this, "nextdefsym in LC_DYSYMTAB load command "<br>
+ "extends past the end of the symbol table");<br>
return;<br>
}<br>
BigSize = Dysymtab.iextdefsym;<br>
BigSize += Dysymtab.nextdefsym;<br>
if (Dysymtab.nextdefsym != 0 && BigSize > Symtab.nsyms) {<br>
- Err = malformedError(*this,<br>
- "truncated or malformed object (iextdefsym plus "<br>
- "nextdefsym in LC_DYSYMTAB load command extends "<br>
- "past the end of the symbol table)");<br>
+ Err = malformedError(*this, "iextdefsym plus nextdefsym in LC_DYSYMTAB "<br>
+ "load command extends past the end of the symbol "<br>
+ "table");<br>
return;<br>
}<br>
if (Dysymtab.nundefsym != 0 && Dysymtab.iundefsym > Symtab.nsyms) {<br>
- Err = malformedError(*this,<br>
- "truncated or malformed object (nundefsym in "<br>
- "LC_DYSYMTAB load command extends past the end of "<br>
- "the symbol table)");<br>
+ Err = malformedError(*this, "nundefsym in LC_DYSYMTAB load command "<br>
+ "extends past the end of the symbol table");<br>
return;<br>
}<br>
BigSize = Dysymtab.iundefsym;<br>
BigSize += Dysymtab.nundefsym;<br>
if (Dysymtab.nundefsym != 0 && BigSize > Symtab.nsyms) {<br>
- Err = malformedError(*this,<br>
- "truncated or malformed object (iundefsym plus "<br>
- "nundefsym in LC_DYSYMTAB load command extends past "<br>
- "the end of the symbol table");<br>
+ Err = malformedError(*this, "iundefsym plus nundefsym in LC_DYSYMTAB load "<br>
+ " command extends past the end of the symbol table");<br>
return;<br>
}<br>
}<br>
@@ -460,10 +433,8 @@ Expected<StringRef> MachOObjectFile::get<br>
MachO::nlist_base Entry = getSymbolTableEntryBase(this, Symb);<br>
const char *Start = &StringTable.data()[Entry.n_strx];<br>
if (Start < getData().begin() || Start >= getData().end()) {<br>
- return malformedError(*this, Twine("truncated or malformed object (bad "<br>
- "string index: ") + Twine(Entry.n_strx) + Twine(" for "<br>
- "symbol at index ") + Twine(getSymbolIndex(Symb)) +<br>
- Twine(")"));<br>
+ return malformedError(*this, "bad string index: " + Twine(Entry.n_strx) +<br>
+ " for symbol at index " + Twine(getSymbolIndex(Symb)));<br>
}<br>
return StringRef(Start);<br>
}<br>
@@ -593,10 +564,8 @@ MachOObjectFile::getSymbolSection(DataRe<br>
DataRefImpl DRI;<br>
DRI.d.a = index - 1;<br>
if (DRI.d.a >= Sections.size()){<br>
- return malformedError(*this, Twine("truncated or malformed object (bad "<br>
- "section index: ") + Twine((int)index) + Twine(" for "<br>
- "symbol at index ") + Twine(getSymbolIndex(Symb)) +<br>
- Twine(")"));<br>
+ return malformedError(*this, "bad section index: " + Twine((int)index) +<br>
+ " for symbol at index " + Twine(getSymbolIndex(Symb)));<br>
}<br>
return section_iterator(SectionRef(DRI, this));<br>
}<br>
@@ -2427,6 +2396,7 @@ ObjectFile::createMachOObjectFile(Memory<br>
return MachOObjectFile::create(Buffer, false, true);<br>
if (Magic == "\xCF\xFA\xED\xFE")<br>
return MachOObjectFile::create(Buffer, true, true);<br>
- return malformedError(Buffer.getBufferIdentifier(),<br>
- "Unrecognized MachO magic number");<br>
+ return make_error<GenericBinaryError>(std::move(Buffer.getBufferIdentifier()),<br>
+ std::move("Unrecognized MachO magic number"),<br>
+ object_error::invalid_file_type);<br>
}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>