Skip to content
  • Kevin Enderby's avatar
    Thread Expected<...> up from createMachOObjectFile() to allow llvm-objdump to... · 3fcdf6ae
    Kevin Enderby authored
    Thread Expected<...> up from createMachOObjectFile() to allow llvm-objdump to produce a real error message
    
    Produce the first specific error message for a malformed Mach-O file describing
    the problem instead of the generic message for object_error::parse_failed of
    "Invalid data was encountered while parsing the file”.  Many more good error
    messages will follow after this first one.
    
    This is built on Lang Hames’ great work of adding the ’Error' class for
    structured error handling and threading Error through MachOObjectFile
    construction.  And making createMachOObjectFile return Expected<...> .
    
    So to to get the error to the llvm-obdump tool, I changed the stack of
    these methods to also return Expected<...> :
    
      object::ObjectFile::createObjectFile()
      object::SymbolicFile::createSymbolicFile()
      object::createBinary()
    
    Then finally in ParseInputMachO() in MachODump.cpp the error can
    be reported and the specific error message can be printed in llvm-objdump
    and can be seen in the existing test case for the existing malformed binary
    but with the updated error message.
    
    Converting these interfaces to Expected<> from ErrorOr<> does involve
    touching a number of places. To contain the changes for now use of
    errorToErrorCode() and errorOrToExpected() are used where the callers
    are yet to be converted.
    
    Also there some were bugs in the existing code that did not deal with the
    old ErrorOr<> return values.  So now with Expected<> since they must be
    checked and the error handled, I added a TODO and a comment:
    “// TODO: Actually report errors helpfully” and a call something like
    consumeError(ObjOrErr.takeError()) so the buggy code will not crash
    since needed to deal with the Error.
    
    Note there is one fix also needed to lld/COFF/InputFiles.cpp that goes along
    with this that I will commit right after this.  So expect lld not to built
    after this commit and before the next one.
    
    llvm-svn: 265606
    3fcdf6ae
Loading