diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-06-04 22:58:25 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-06-04 22:58:25 +0000 |
| commit | 18ad2e54ab8012e3dd8bffc6f0e1a98683afa2fc (patch) | |
| tree | 971f0ad48dbcc4e2ab4cdfe827684384e0cb2e3f | |
| parent | 64c2f5a50fa21c04b8a392f9ebed4521ab8413d7 (diff) | |
| download | bcm5719-llvm-18ad2e54ab8012e3dd8bffc6f0e1a98683afa2fc.tar.gz bcm5719-llvm-18ad2e54ab8012e3dd8bffc6f0e1a98683afa2fc.zip | |
[Object, ELF] Don't call llvm_unreachable() from createELFObjectFile.
Instead, return a proper error code from factory.
llvm-svn: 239113
| -rw-r--r-- | llvm/lib/Object/ELFObjectFile.cpp | 4 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/Inputs/invalid.elf.2 | 1 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/dwarfdump-invalid.test | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/Object/ELFObjectFile.cpp b/llvm/lib/Object/ELFObjectFile.cpp index 8847a20d96e..1ffdc01bcd3 100644 --- a/llvm/lib/Object/ELFObjectFile.cpp +++ b/llvm/lib/Object/ELFObjectFile.cpp @@ -38,7 +38,7 @@ ObjectFile::createELFObjectFile(MemoryBufferRef Obj) { else if (Ident.second == ELF::ELFDATA2MSB) R.reset(new ELFObjectFile<ELFType<support::big, false>>(Obj, EC)); else - llvm_unreachable("Buffer is not an ELF object file!"); + return object_error::parse_failed; } else { assert(Ident.first == ELF::ELFCLASS64); if (Ident.second == ELF::ELFDATA2LSB) @@ -46,7 +46,7 @@ ObjectFile::createELFObjectFile(MemoryBufferRef Obj) { else if (Ident.second == ELF::ELFDATA2MSB) R.reset(new ELFObjectFile<ELFType<support::big, true>>(Obj, EC)); else - llvm_unreachable("Buffer is not an ELF object file!"); + return object_error::parse_failed; } if (EC) diff --git a/llvm/test/DebugInfo/Inputs/invalid.elf.2 b/llvm/test/DebugInfo/Inputs/invalid.elf.2 new file mode 100644 index 00000000000..16528a55a93 --- /dev/null +++ b/llvm/test/DebugInfo/Inputs/invalid.elf.2 @@ -0,0 +1 @@ +ELF'L:þB“ELFï
\ No newline at end of file diff --git a/llvm/test/DebugInfo/dwarfdump-invalid.test b/llvm/test/DebugInfo/dwarfdump-invalid.test index dcbdd739190..5b616bd5581 100644 --- a/llvm/test/DebugInfo/dwarfdump-invalid.test +++ b/llvm/test/DebugInfo/dwarfdump-invalid.test @@ -1,4 +1,5 @@ ; Verify that llvm-dwarfdump doesn't crash on broken input files. RUN: llvm-dwarfdump %p/Inputs/invalid.elf 2>&1 | FileCheck %s --check-prefix=INVALID-ELF +RUN: llvm-dwarfdump %p/Inputs/invalid.elf.2 2>&1 | FileCheck %s --check-prefix=INVALID-ELF INVALID-ELF: Invalid data was encountered while parsing the file |
