[PATCH] D60147: [DWARF] check whether the DIE is valid before querying for information

[Paul Semel via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL357607: [DWARF] check whether the DIE is valid before querying for information (authored by paulsemel, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D60147?vs=193398&id=193536#toc

Repository:
  rL LLVM

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

https://reviews.llvm.org/D60147

Files:
  llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
  llvm/trunk/test/DebugInfo/dwarfdump-bad-lookup-address.test


Index: llvm/trunk/test/DebugInfo/dwarfdump-bad-lookup-address.test
===================================================================
--- llvm/trunk/test/DebugInfo/dwarfdump-bad-lookup-address.test
+++ llvm/trunk/test/DebugInfo/dwarfdump-bad-lookup-address.test
@@ -0,0 +1,11 @@
+#RUN: llvm-dwarfdump -lookup 1161 %p/Inputs/dwarfdump-test.macho-i386.o | FileCheck %s
+
+// When we pass an address to getDIEsFromAddress that doesn't belong to any DIE
+// (only to a CU), this function is triggering an assert, which is not the
+// intended behavior (as the address still belongs to a CU).
+
+#CHECK: DW_TAG_compile_unit
+#CHECK-NEXT:   DW_AT_producer{{.*}}"clang version 3.6.2 (tags/RELEASE_362/final)"
+#CHECK-NEXT:   DW_AT_language{{.*}}DW_LANG_C_plus_plus
+#CHECK-NEXT:   DW_AT_name{{.*}}"dwarfdump-test.cc"
+#CHECK-NOT:    DW_TAG
Index: llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
===================================================================
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -925,6 +925,9 @@
     DWARFDie DIE = Worklist.back();
     Worklist.pop_back();
 
+    if (!DIE.isValid())
+      continue;
+
     if (DIE.getTag() == DW_TAG_lexical_block &&
         DIE.addressRangeContainsAddress(Address)) {
       Result.BlockDIE = DIE;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60147.193536.patch
Type: text/x-patch
Size: 1322 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190403/d169cfec/attachment.bin>