[PATCH] D67962: [llvm-readobj] - Don't crash when dumping .stack_sizes and unable to find a relocation resolver.

[George Rimar via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL372838: [llvm-readobj] - Don't crash when dumping .stack_sizes and unable to find a… (authored by grimar, committed by ).
Herald added a project: LLVM.

Changed prior to commit:
  https://reviews.llvm.org/D67962?vs=221533&id=221699#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67962/new/

https://reviews.llvm.org/D67962

Files:
  llvm/trunk/test/tools/llvm-readobj/stack-sizes.test
  llvm/trunk/tools/llvm-readobj/ELFDumper.cpp


Index: llvm/trunk/test/tools/llvm-readobj/stack-sizes.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/stack-sizes.test
+++ llvm/trunk/test/tools/llvm-readobj/stack-sizes.test
@@ -597,3 +597,29 @@
     Value:   0x10
     Type:    STT_FUNC
     Binding: STB_GLOBAL
+
+## Check that we report an error when we are unable to resolve a relocation for a given ELF architecture.
+## Here we have a 64-bit relocation used in a 32-bit object.
+
+# RUN: yaml2obj --docnum=12 %s > %t17
+# RUN: not llvm-readelf --stack-sizes %t17 2>&1 | FileCheck %s -DFILE=%t17 --check-prefix=UNSUPPRELOC2
+# RUN: not llvm-readobj --stack-sizes %t17 2>&1 | FileCheck %s -DFILE=%t17 --check-prefix=UNSUPPRELOC2
+
+# UNSUPPRELOC2: error: '[[FILE]]': unsupported relocation type in section .rela.stack_sizes: R_X86_64_64
+
+--- !ELF
+FileHeader:
+  Class:   ELFCLASS32
+  Data:    ELFDATA2MSB
+  Type:    ET_REL
+  Machine: EM_X86_64
+Sections:
+  - Name: .stack_sizes
+    Type: SHT_PROGBITS
+    Content: "00"
+  - Name: .rela.stack_sizes
+    Type: SHT_RELA
+    Info: .stack_sizes
+    Relocations:
+      - Offset: 0
+        Type:   R_X86_64_64
Index: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
===================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
@@ -4935,7 +4935,7 @@
     auto Contents = unwrapOrError(this->FileName, StackSizesSec.getContents());
     DataExtractor Data(Contents, Obj->isLittleEndian(), sizeof(Elf_Addr));
     for (const RelocationRef &Reloc : RelocSec.relocations()) {
-      if (!IsSupportedFn(Reloc.getType()))
+      if (!IsSupportedFn || !IsSupportedFn(Reloc.getType()))
         reportError(createStringError(
                         object_error::parse_failed,
                         "unsupported relocation type in section %s: %s",


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67962.221699.patch
Type: text/x-patch
Size: 1917 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190925/6c0b71d2/attachment.bin>