mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 19:23:23 +01:00
a6534d0295
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
83 lines
3.1 KiB
C++
83 lines
3.1 KiB
C++
//===- SymbolicFile.cpp - Interface that only provides symbols --*- C++ -*-===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file defines a file format independent SymbolicFile class.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "llvm/Object/COFF.h"
|
|
#include "llvm/Object/COFFImportFile.h"
|
|
#include "llvm/Object/IRObjectFile.h"
|
|
#include "llvm/Object/ObjectFile.h"
|
|
#include "llvm/Object/SymbolicFile.h"
|
|
#include "llvm/Support/MemoryBuffer.h"
|
|
|
|
using namespace llvm;
|
|
using namespace object;
|
|
|
|
SymbolicFile::SymbolicFile(unsigned int Type, MemoryBufferRef Source)
|
|
: Binary(Type, Source) {}
|
|
|
|
SymbolicFile::~SymbolicFile() {}
|
|
|
|
Expected<std::unique_ptr<SymbolicFile>> SymbolicFile::createSymbolicFile(
|
|
MemoryBufferRef Object, sys::fs::file_magic Type, LLVMContext *Context) {
|
|
StringRef Data = Object.getBuffer();
|
|
if (Type == sys::fs::file_magic::unknown)
|
|
Type = sys::fs::identify_magic(Data);
|
|
|
|
switch (Type) {
|
|
case sys::fs::file_magic::bitcode:
|
|
if (Context)
|
|
return errorOrToExpected(IRObjectFile::create(Object, *Context));
|
|
// Fallthrough
|
|
case sys::fs::file_magic::unknown:
|
|
case sys::fs::file_magic::archive:
|
|
case sys::fs::file_magic::macho_universal_binary:
|
|
case sys::fs::file_magic::windows_resource:
|
|
return errorCodeToError(object_error::invalid_file_type);
|
|
case sys::fs::file_magic::elf:
|
|
case sys::fs::file_magic::elf_executable:
|
|
case sys::fs::file_magic::elf_shared_object:
|
|
case sys::fs::file_magic::elf_core:
|
|
case sys::fs::file_magic::macho_executable:
|
|
case sys::fs::file_magic::macho_fixed_virtual_memory_shared_lib:
|
|
case sys::fs::file_magic::macho_core:
|
|
case sys::fs::file_magic::macho_preload_executable:
|
|
case sys::fs::file_magic::macho_dynamically_linked_shared_lib:
|
|
case sys::fs::file_magic::macho_dynamic_linker:
|
|
case sys::fs::file_magic::macho_bundle:
|
|
case sys::fs::file_magic::macho_dynamically_linked_shared_lib_stub:
|
|
case sys::fs::file_magic::macho_dsym_companion:
|
|
case sys::fs::file_magic::macho_kext_bundle:
|
|
case sys::fs::file_magic::pecoff_executable:
|
|
return ObjectFile::createObjectFile(Object, Type);
|
|
case sys::fs::file_magic::coff_import_library:
|
|
return std::unique_ptr<SymbolicFile>(new COFFImportFile(Object));
|
|
case sys::fs::file_magic::elf_relocatable:
|
|
case sys::fs::file_magic::macho_object:
|
|
case sys::fs::file_magic::coff_object: {
|
|
Expected<std::unique_ptr<ObjectFile>> Obj =
|
|
ObjectFile::createObjectFile(Object, Type);
|
|
if (!Obj || !Context)
|
|
return std::move(Obj);
|
|
|
|
ErrorOr<MemoryBufferRef> BCData =
|
|
IRObjectFile::findBitcodeInObject(*Obj->get());
|
|
if (!BCData)
|
|
return std::move(Obj);
|
|
|
|
return errorOrToExpected(IRObjectFile::create(
|
|
MemoryBufferRef(BCData->getBuffer(),
|
|
Object.getBufferIdentifier()), *Context));
|
|
}
|
|
}
|
|
llvm_unreachable("Unexpected Binary File Type");
|
|
}
|