maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

DebugInfo: (NFC) Refactor DWARF version calculation to make a future change (-fdebug-default-version) easier

This commit is contained in:
David Blaikie 2019-11-01 14:22:29 -07:00
parent 96bb076621
commit 42465f406b
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clang/lib/Driver/ToolChains/Clang.cpp
View File

@ -3198,11 +3198,16 @@ static void RenderDebugOptions(const ToolChain &TC, const Driver &D,
} }
// If a -gdwarf argument appeared, remember it. // If a -gdwarf argument appeared, remember it.
if (const Arg *A = const Arg *GDwarfN =
Args.getLastArg(options::OPT_gdwarf_2, options::OPT_gdwarf_3, Args.getLastArg(options::OPT_gdwarf_2, options::OPT_gdwarf_3,
options::OPT_gdwarf_4, options::OPT_gdwarf_5)) options::OPT_gdwarf_4, options::OPT_gdwarf_5);
if (checkDebugInfoOption(A, Args, D, TC)) bool EmitDwarf = false;
DWARFVersion = DwarfVersionNum(A->getSpelling()); if (GDwarfN) {
if (checkDebugInfoOption(GDwarfN, Args, D, TC))
EmitDwarf = true;
else
GDwarfN = nullptr;
}
if (const Arg *A = Args.getLastArg(options::OPT_gcodeview)) { if (const Arg *A = Args.getLastArg(options::OPT_gcodeview)) {
if (checkDebugInfoOption(A, Args, D, TC)) if (checkDebugInfoOption(A, Args, D, TC))
@ -3211,18 +3216,28 @@ static void RenderDebugOptions(const ToolChain &TC, const Driver &D,
// If the user asked for debug info but did not explicitly specify -gcodeview // If the user asked for debug info but did not explicitly specify -gcodeview
// or -gdwarf, ask the toolchain for the default format. // or -gdwarf, ask the toolchain for the default format.
if (!EmitCodeView && DWARFVersion == 0 && if (!EmitCodeView && !EmitDwarf &&
DebugInfoKind != codegenoptions::NoDebugInfo) { DebugInfoKind != codegenoptions::NoDebugInfo) {
switch (TC.getDefaultDebugFormat()) { switch (TC.getDefaultDebugFormat()) {
case codegenoptions::DIF_CodeView: case codegenoptions::DIF_CodeView:
EmitCodeView = true; EmitCodeView = true;
break; break;
case codegenoptions::DIF_DWARF: case codegenoptions::DIF_DWARF:
DWARFVersion = TC.GetDefaultDwarfVersion(); EmitDwarf = true;
break; break;
} }
} }
if (EmitDwarf) {
// Start with the platform default DWARF version
DWARFVersion = TC.GetDefaultDwarfVersion();
// Override with a user-specified DWARF version
if (GDwarfN)
if (auto ExplicitVersion = DwarfVersionNum(GDwarfN->getSpelling()))
DWARFVersion = ExplicitVersion;
}
// -gline-directives-only supported only for the DWARF debug info. // -gline-directives-only supported only for the DWARF debug info.
if (DWARFVersion == 0 && DebugInfoKind == codegenoptions::DebugDirectivesOnly) if (DWARFVersion == 0 && DebugInfoKind == codegenoptions::DebugDirectivesOnly)
DebugInfoKind = codegenoptions::NoDebugInfo; DebugInfoKind = codegenoptions::NoDebugInfo;