From 3c338f3a7e224f6da82e3adc1bbff9c0265d59e0 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sat, 22 Aug 2015 22:36:40 +0000 Subject: [PATCH] Verifier: Don't crash on null entries in debug info retained types list There was already a good error path for this. Added a test for it & made a minor code change to ensure the error path was actually reached, rather than crashing before we got that far. llvm-svn: 245795 --- llvm/lib/IR/Verifier.cpp | 2 +- llvm/test/Verifier/dbg-null-retained-type.ll | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 llvm/test/Verifier/dbg-null-retained-type.ll diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index af1121e3c737..813d06cf643a 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -3782,7 +3782,7 @@ void Verifier::verifyTypeRefs() { for (auto *CU : CUs->operands()) if (auto Ts = cast(CU)->getRetainedTypes()) for (DIType *Op : Ts) - if (auto *T = dyn_cast(Op)) + if (auto *T = dyn_cast_or_null(Op)) if (auto *S = T->getRawIdentifier()) { UnresolvedTypeRefs.erase(S); TypeRefs.insert(std::make_pair(S, T)); diff --git a/llvm/test/Verifier/dbg-null-retained-type.ll b/llvm/test/Verifier/dbg-null-retained-type.ll new file mode 100644 index 000000000000..f0368c8c4877 --- /dev/null +++ b/llvm/test/Verifier/dbg-null-retained-type.ll @@ -0,0 +1,10 @@ +; RUN: not llvm-as -disable-output <%s 2>&1 | FileCheck %s +; CHECK: assembly parsed, but does not verify +; CHECK-NEXT: invalid retained type + +!llvm.module.flags = !{!0} +!0 = !{i32 2, !"Debug Info Version", i32 3} +!llvm.dbg.cu = !{!1} +!1 = distinct !DICompileUnit(file: !2, language: DW_LANG_C99, retainedTypes: !3) +!2 = !DIFile(filename: "file.c", directory: "/path/to/dir") +!3 = !{null}