summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavide Italiano <davide@freebsd.org>2016-04-06 18:46:39 +0000
committerDavide Italiano <davide@freebsd.org>2016-04-06 18:46:39 +0000
commit5f1c87bf0741f09fafbb46fbb211c269b9b5391b (patch)
tree9cbe4ada6936ad2a654a1ada75c94c98ccea2ba9
parent6ac88cc1eca25ffb28b6f5fb5bae5e8340c2c58b (diff)
downloadbcm5719-llvm-5f1c87bf0741f09fafbb46fbb211c269b9b5391b.tar.gz
bcm5719-llvm-5f1c87bf0741f09fafbb46fbb211c269b9b5391b.zip
[IRVerifier] Don't crash on invalid DIFile inside DISubprogram.
r265515, this time with the correct fix. file inside DISubprogram is not mandatory. llvm-svn: 265586
-rw-r--r--llvm/lib/IR/Verifier.cpp2
-rw-r--r--llvm/test/Verifier/dbg-difile-crash.ll10
2 files changed, 12 insertions, 0 deletions
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index fad4aacb52d..212e2bf38cd 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -988,6 +988,8 @@ void Verifier::visitDICompileUnit(const DICompileUnit &N) {
void Verifier::visitDISubprogram(const DISubprogram &N) {
Assert(N.getTag() == dwarf::DW_TAG_subprogram, "invalid tag", &N);
Assert(isScopeRef(N, N.getRawScope()), "invalid scope", &N, N.getRawScope());
+ if (auto *F = N.getRawFile())
+ Assert(isa<DIFile>(F), "invalid file", &N, F);
if (auto *T = N.getRawType())
Assert(isa<DISubroutineType>(T), "invalid subroutine type", &N, T);
Assert(isTypeRef(N, N.getRawContainingType()), "invalid containing type", &N,
diff --git a/llvm/test/Verifier/dbg-difile-crash.ll b/llvm/test/Verifier/dbg-difile-crash.ll
new file mode 100644
index 00000000000..75ec889c0da
--- /dev/null
+++ b/llvm/test/Verifier/dbg-difile-crash.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 file
+
+!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, subprograms: !{!3})
+!2 = !DIFile(filename: "file.c", directory: "/path/to/dir")
+!3 = distinct !DISubprogram(name: "blah", file: !1)
OpenPOWER on IntegriCloud