summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorDavide Italiano <davide@freebsd.org>2016-10-17 20:05:35 +0000
committerDavide Italiano <davide@freebsd.org>2016-10-17 20:05:35 +0000
commit84bd58e915db2495ac91965f73b31e4f7d5244f4 (patch)
treef141c9defceebfd711483cfe3f5c3bc68a758c5a /llvm
parent119a998ae3895ff360fc2ddb32f387927dbb2a33 (diff)
downloadbcm5719-llvm-84bd58e915db2495ac91965f73b31e4f7d5244f4.tar.gz
bcm5719-llvm-84bd58e915db2495ac91965f73b31e4f7d5244f4.zip
[opt] Strip coverage if debug info is not present.
If -coverage is passed, but -g is not, clang populates the PassManager pipeline with StripSymbols(debugOnly = true). The stripSymbol pass therefore scans the list of named metadata, drops !llvm.dbg.cu, but leaves !llvm.gcov and !0 (the compileUnit MD) around. The verifier runs, and finds out that there's a CU not listed in !llvm.dbg.cu (as it was previously dropped) -> crash. When we strip debug info, so, check if there's coverage data, and strip it as well, in order to avoid pending metadata left around. Differential Revision: https://reviews.llvm.org/D25689 llvm-svn: 284418
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/IR/DebugInfo.cpp6
-rw-r--r--llvm/test/Transforms/StripSymbols/strip-cov.ll20
2 files changed, 25 insertions, 1 deletions
diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp
index 80f97b3e049..be00387682f 100644
--- a/llvm/lib/IR/DebugInfo.cpp
+++ b/llvm/lib/IR/DebugInfo.cpp
@@ -272,7 +272,11 @@ bool llvm::StripDebugInfo(Module &M) {
NME = M.named_metadata_end(); NMI != NME;) {
NamedMDNode *NMD = &*NMI;
++NMI;
- if (NMD->getName().startswith("llvm.dbg.")) {
+
+ // We're stripping debug info, and without them, coverage information
+ // doesn't quite make sense.
+ if (NMD->getName().startswith("llvm.dbg.") ||
+ NMD->getName() == "llvm.gcov") {
NMD->eraseFromParent();
Changed = true;
}
diff --git a/llvm/test/Transforms/StripSymbols/strip-cov.ll b/llvm/test/Transforms/StripSymbols/strip-cov.ll
new file mode 100644
index 00000000000..ad74bdae514
--- /dev/null
+++ b/llvm/test/Transforms/StripSymbols/strip-cov.ll
@@ -0,0 +1,20 @@
+; RUN: opt -S %s -strip -o - | FileCheck %s
+
+; CHECK-NOT: !llvm.dbg.cu
+; CHECK-NOT: !llvm.gcov
+
+; CHECK: !llvm.module.flags = !{!0}
+; CHECK: !0 = !{i32 2, !"Debug Info Version", i32 3}
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3}
+!llvm.gcov = !{!4}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 4.0.0 (trunk 284352) (llvm/trunk 284353)", isOptimized: false, runtimeVersion: 0, emissionKind: NoDebug, enums: !2)
+!1 = !DIFile(filename: "/dev/null", directory: "/home/davide/work/llvm/build/bin")
+!2 = !{}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{!"/scratch/patatino/build/bin/null.gcno", !"/scratch/patatino/build/bin/null.gcda", !0}
OpenPOWER on IntegriCloud