mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 11:13:28 +01:00
92582f2b18
Produce another specific error message for a malformed Mach-O file when a symbol’s string index is past the end of the string table. The existing test case in test/Object/macho-invalid.test for macho-invalid-symbol-name-past-eof now reports the error with the message indicating that a symbol at a specific index has a bad sting index and that bad string index value. Again converting interfaces to Expected<> from ErrorOr<> does involve touching a number of places. Where the existing code reported the error with a string message or an error code it was converted to do the same. There is some code for this that could be factored into a routine but I would like to leave that for the code owners post-commit to do as they want for handling an llvm::Error. An example of how this could be done is shown in the diff in lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h which had a Check() routine already for std::error_code so I added one like it for llvm::Error . 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(NameOrErr.takeError()) so the buggy code will not crash since needed to deal with the Error. Note there fixes needed to lld 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: 266919
72 lines
2.2 KiB
C++
72 lines
2.2 KiB
C++
//===-- llvm-readobj.h ----------------------------------------------------===//
|
|
//
|
|
// The LLVM Compiler Infrastructure
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef LLVM_TOOLS_LLVM_READOBJ_LLVM_READOBJ_H
|
|
#define LLVM_TOOLS_LLVM_READOBJ_LLVM_READOBJ_H
|
|
|
|
#include "llvm/Support/CommandLine.h"
|
|
#include "llvm/Support/Compiler.h"
|
|
#include "llvm/Support/ErrorOr.h"
|
|
#include "llvm/Support/Error.h"
|
|
#include <string>
|
|
|
|
namespace llvm {
|
|
namespace object {
|
|
class RelocationRef;
|
|
}
|
|
|
|
// Various helper functions.
|
|
LLVM_ATTRIBUTE_NORETURN void reportError(Twine Msg);
|
|
void error(std::error_code ec);
|
|
template <class T> T unwrapOrError(ErrorOr<T> EO) {
|
|
if (EO)
|
|
return *EO;
|
|
reportError(EO.getError().message());
|
|
}
|
|
template <class T> T unwrapOrError(Expected<T> EO) {
|
|
if (EO)
|
|
return *EO;
|
|
std::string Buf;
|
|
raw_string_ostream OS(Buf);
|
|
logAllUnhandledErrors(EO.takeError(), OS, "");
|
|
OS.flush();
|
|
reportError(Buf);
|
|
}
|
|
bool relocAddressLess(object::RelocationRef A,
|
|
object::RelocationRef B);
|
|
} // namespace llvm
|
|
|
|
namespace opts {
|
|
extern llvm::cl::list<std::string> InputFilenames;
|
|
extern llvm::cl::opt<bool> FileHeaders;
|
|
extern llvm::cl::opt<bool> Sections;
|
|
extern llvm::cl::opt<bool> SectionRelocations;
|
|
extern llvm::cl::opt<bool> SectionSymbols;
|
|
extern llvm::cl::opt<bool> SectionData;
|
|
extern llvm::cl::opt<bool> Relocations;
|
|
extern llvm::cl::opt<bool> Symbols;
|
|
extern llvm::cl::opt<bool> DynamicSymbols;
|
|
extern llvm::cl::opt<bool> UnwindInfo;
|
|
extern llvm::cl::opt<bool> ExpandRelocs;
|
|
extern llvm::cl::opt<bool> CodeView;
|
|
extern llvm::cl::opt<bool> CodeViewSubsectionBytes;
|
|
extern llvm::cl::opt<bool> ARMAttributes;
|
|
extern llvm::cl::opt<bool> MipsPLTGOT;
|
|
enum OutputStyleTy { LLVM, GNU };
|
|
extern llvm::cl::opt<OutputStyleTy> Output;
|
|
} // namespace opts
|
|
|
|
#define LLVM_READOBJ_ENUM_ENT(ns, enum) \
|
|
{ #enum, ns::enum }
|
|
|
|
#define LLVM_READOBJ_ENUM_CLASS_ENT(enum_class, enum) \
|
|
{ #enum, std::underlying_type<enum_class>::type(enum_class::enum) }
|
|
|
|
#endif
|