Skip to content

Commit

Permalink
[StripDeadDebugInfo] Drop dead CUs entirely
Browse files Browse the repository at this point in the history
Summary:
Prior to this while it would delete the dead DIGlobalVariables, it would
leave dead DICompileUnits and everything referenced therefrom. For a bit
bitcode file with thousands of compile units those dead nodes easily
outnumbered the real ones. Clean that up.

Reviewed By: aprantl
Differential Revision: https://reviews.llvm.org/D31720

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@299692 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
Keno committed Apr 6, 2017
1 parent e4f931e commit 93e3e80
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 2 deletions.
25 changes: 25 additions & 0 deletions lib/Transforms/IPO/StripSymbols.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,15 @@ bool StripDeadDebugInfo::runOnModule(Module &M) {
LiveGVs.insert(GVE);
}

std::set<DICompileUnit *> LiveCUs;
// Any CU referenced from a function is live.
for (Function &F : M.functions()) {
DISubprogram *SP = F.getSubprogram();
if (SP && SP->getUnit())
LiveCUs.insert(SP->getUnit());
}

bool HasDeadCUs = false;
for (DICompileUnit *DIC : F.compile_units()) {
// Create our live global variable list.
bool GlobalVariableChange = false;
Expand All @@ -341,6 +350,11 @@ bool StripDeadDebugInfo::runOnModule(Module &M) {
GlobalVariableChange = true;
}

if (!LiveGlobalVariables.empty())
LiveCUs.insert(DIC);
else if (!LiveCUs.count(DIC))
HasDeadCUs = true;

// If we found dead global variables, replace the current global
// variable list with our new live global variable list.
if (GlobalVariableChange) {
Expand All @@ -352,5 +366,16 @@ bool StripDeadDebugInfo::runOnModule(Module &M) {
LiveGlobalVariables.clear();
}

if (HasDeadCUs) {
// Delete the old node and replace it with a new one
NamedMDNode *NMD = M.getOrInsertNamedMetadata("llvm.dbg.cu");
NMD->clearOperands();
if (!LiveCUs.empty()) {
for (DICompileUnit *CU : LiveCUs)
NMD->addOperand(CU);
}
Changed = true;
}

return Changed;
}
11 changes: 9 additions & 2 deletions test/Transforms/StripSymbols/strip-dead-debug-info.ll
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
; CHECK: ModuleID = '{{.*}}'
; CHECK-NOT: "bar"
; CHECK-NOT: "abcd"
; CHECK-NOT: "GCC"
; CHECK: "Globals"
; CHECK: "abcd2"

source_filename = "test/Transforms/StripSymbols/strip-dead-debug-info.ll"

Expand All @@ -29,7 +32,7 @@ attributes #0 = { nounwind readnone }
attributes #1 = { nounwind readnone ssp }
attributes #2 = { nounwind readonly ssp }

!llvm.dbg.cu = !{!4}
!llvm.dbg.cu = !{!4, !23, !24}
!llvm.module.flags = !{!9}

!0 = !DIGlobalVariableExpression(var: !1)
Expand All @@ -55,4 +58,8 @@ attributes #2 = { nounwind readonly ssp }
!20 = !DILocation(line: 7, scope: !15)
!21 = !DILocation(line: 10, scope: !22)
!22 = distinct !DILexicalBlock(scope: !15, file: !2, line: 7)

!23 = distinct !DICompileUnit(language: DW_LANG_C89, file: !2, producer: "GCC", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !5, retainedTypes: !5, globals: !5)
!24 = distinct !DICompileUnit(language: DW_LANG_C89, file: !2, producer: "Globals", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !5, retainedTypes: !5, globals: !25)
!25 = !{!26}
!26 = !DIGlobalVariableExpression(var: !27, expr: !DIExpression(DW_OP_constu, 0, DW_OP_stack_value))
!27 = !DIGlobalVariable(name: "abcd2", scope: !2, file: !2, line: 2, type: !3, isLocal: true, isDefinition: true)

0 comments on commit 93e3e80

Please sign in to comment.