RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-03 13:51:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

obj2yaml: Improve error reporting

Browse Source 
Previously only the error codes were reported which
meant that useful information about malformed inputs
was not shown.

Differential Revision: https://reviews.llvm.org/D34008

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@305609 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sam Clegg 2017-06-16 23:29:54 +00:00
parent 86f1ba02a9
commit b856c16f91
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/Object/obj2yaml.test
View File

@ -478,4 +478,4 @@ ELF-X86-64-UNWIND-NEXT: AddressAlign: 0x0000000000000001
ELF-X86-64-UNWIND-NEXT: Content: ''
RUN: not obj2yaml %t.blah 2>&1 | FileCheck --check-prefix=ENOENT %s
ENOENT: Error: '{{[Nn]}}o such file or directory'
ENOENT: Error reading file: {{.*}}.blah: {{[Nn]}}o such file or directory

2
test/ObjectYAML/wasm/header_invalid_version.yaml
View File

@ -3,4 +3,4 @@
FileHeader:
Version: 0x00000002
...
# CHECK: Error: 'Invalid data was encountered while parsing the file'
# CHECK: Error reading file: <stdin>: Bad version number

4
test/tools/obj2yaml/invalid_input_file.test Normal file
View File

@ -0,0 +1,4 @@
# RUN: not obj2yaml %p/path/does/not/exist 2>&1 | FileCheck %s
# Don't check the OS-dependent message "No such file or directory".
# CHECK: Error reading file: {{.*}}/path/does/not/exist: {{.*}}

25
tools/obj2yaml/obj2yaml.cpp
View File

@ -30,21 +30,32 @@ static std::error_code dumpObject(const ObjectFile &Obj) {
return obj2yaml_error::unsupported_obj_file_format;
}
static std::error_code dumpInput(StringRef File) {
static Error dumpInput(StringRef File) {
Expected<OwningBinary<Binary>> BinaryOrErr = createBinary(File);
if (!BinaryOrErr)
return errorToErrorCode(BinaryOrErr.takeError());
return BinaryOrErr.takeError();
Binary &Binary = *BinaryOrErr.get().getBinary();
// Universal MachO is not a subclass of ObjectFile, so it needs to be handled
// here with the other binary types.
if (Binary.isMachO() || Binary.isMachOUniversalBinary())
return macho2yaml(outs(), Binary);
return errorCodeToError(macho2yaml(outs(), Binary));
// TODO: If this is an archive, then burst it and dump each entry
if (ObjectFile *Obj = dyn_cast<ObjectFile>(&Binary))
return dumpObject(*Obj);
return errorCodeToError(dumpObject(*Obj));
return obj2yaml_error::unrecognized_file_format;
return Error::success();
}
static void reportError(StringRef Input, Error Err) {
if (Input == "-")
Input = "<stdin>";
std::string ErrMsg;
raw_string_ostream OS(ErrMsg);
logAllUnhandledErrors(std::move(Err), OS, "");
OS.flush();
errs() << "Error reading file: " << Input << ": " << ErrMsg;
errs().flush();
}
cl::opt<std::string> InputFilename(cl::Positional, cl::desc("<input file>"),
@ -56,8 +67,8 @@ int main(int argc, char *argv[]) {
PrettyStackTraceProgram X(argc, argv);
llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
if (std::error_code EC = dumpInput(InputFilename)) {
errs() << "Error: '" << EC.message() << "'\n";
if (Error Err = dumpInput(InputFilename)) {
reportError(InputFilename, std::move(Err));
return 1;
}