From a0ca4c46ca35957a38a6023fa84afda2fc9ba0ec Mon Sep 17 00:00:00 2001 From: Chen Zheng Date: Sun, 9 May 2021 22:04:02 -0400 Subject: [PATCH] [Debug-Info] add -gstrict-dwarf support in backend Reviewed By: dblaikie, probinson Differential Revision: https://reviews.llvm.org/D100826 --- clang/lib/CodeGen/BackendUtil.cpp | 1 + llvm/include/llvm/CodeGen/CommandFlags.h | 2 + llvm/include/llvm/Target/TargetOptions.h | 5 +++ llvm/lib/CodeGen/CommandFlags.cpp | 6 +++ llvm/test/DebugInfo/PowerPC/strict-dwarf.ll | 60 +++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+) create mode 100644 llvm/test/DebugInfo/PowerPC/strict-dwarf.ll diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 2be0b1a..e2799f6 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -598,6 +598,7 @@ static bool initTargetOptions(DiagnosticsEngine &Diags, Entry.IgnoreSysRoot ? Entry.Path : HSOpts.Sysroot + Entry.Path); Options.MCOptions.Argv0 = CodeGenOpts.Argv0; Options.MCOptions.CommandLineArgs = CodeGenOpts.CommandLineArgs; + Options.DebugStrictDwarf = CodeGenOpts.DebugStrictDwarf; return true; } diff --git a/llvm/include/llvm/CodeGen/CommandFlags.h b/llvm/include/llvm/CodeGen/CommandFlags.h index a127338..f4555c3 100644 --- a/llvm/include/llvm/CodeGen/CommandFlags.h +++ b/llvm/include/llvm/CodeGen/CommandFlags.h @@ -140,6 +140,8 @@ bool getForceDwarfFrameSection(); bool getXRayOmitFunctionIndex(); +bool getDebugStrictDwarf(); + /// Create this object with static storage to register codegen-related command /// line options. struct RegisterCodeGenFlags { diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h index cad356e..09c8cf5 100644 --- a/llvm/include/llvm/Target/TargetOptions.h +++ b/llvm/include/llvm/Target/TargetOptions.h @@ -137,6 +137,7 @@ namespace llvm { SupportsDebugEntryValues(false), EnableDebugEntryValues(false), PseudoProbeForProfiling(false), ValueTrackingVariableLocations(false), ForceDwarfFrameSection(false), XRayOmitFunctionIndex(false), + DebugStrictDwarf(false), FPDenormalMode(DenormalMode::IEEE, DenormalMode::IEEE) {} /// DisableFramePointerElim - This returns true if frame pointer elimination @@ -327,6 +328,10 @@ namespace llvm { /// Emit XRay Function Index section unsigned XRayOmitFunctionIndex : 1; + /// When set to true, don't use DWARF extensions in later DWARF versions. + /// By default, it is set to false. + unsigned DebugStrictDwarf : 1; + /// Stack protector guard offset to use. int StackProtectorGuardOffset = INT_MAX; diff --git a/llvm/lib/CodeGen/CommandFlags.cpp b/llvm/lib/CodeGen/CommandFlags.cpp index 4c6c595..b8f1ca1 100644 --- a/llvm/lib/CodeGen/CommandFlags.cpp +++ b/llvm/lib/CodeGen/CommandFlags.cpp @@ -97,6 +97,7 @@ CGOPT(bool, PseudoProbeForProfiling) CGOPT(bool, ValueTrackingVariableLocations) CGOPT(bool, ForceDwarfFrameSection) CGOPT(bool, XRayOmitFunctionIndex) +CGOPT(bool, DebugStrictDwarf) codegen::RegisterCodeGenFlags::RegisterCodeGenFlags() { #define CGBINDOPT(NAME) \ @@ -471,6 +472,10 @@ codegen::RegisterCodeGenFlags::RegisterCodeGenFlags() { cl::init(false)); CGBINDOPT(XRayOmitFunctionIndex); + static cl::opt DebugStrictDwarf( + "strict-dwarf", cl::desc("use strict dwarf"), cl::init(false)); + CGBINDOPT(DebugStrictDwarf); + #undef CGBINDOPT mc::RegisterMCTargetOptionsFlags(); @@ -567,6 +572,7 @@ codegen::InitTargetOptionsFromCodeGenFlags(const Triple &TheTriple) { Options.ValueTrackingVariableLocations = getValueTrackingVariableLocations(); Options.ForceDwarfFrameSection = getForceDwarfFrameSection(); Options.XRayOmitFunctionIndex = getXRayOmitFunctionIndex(); + Options.DebugStrictDwarf = getDebugStrictDwarf(); Options.MCOptions = mc::InitMCTargetOptionsFromFlags(); diff --git a/llvm/test/DebugInfo/PowerPC/strict-dwarf.ll b/llvm/test/DebugInfo/PowerPC/strict-dwarf.ll new file mode 100644 index 0000000..b64fd42 --- /dev/null +++ b/llvm/test/DebugInfo/PowerPC/strict-dwarf.ll @@ -0,0 +1,60 @@ +; RUN: llc -filetype=obj -mtriple=powerpc64le-unknown-linux-gnu < %s | \ +; RUN: llvm-dwarfdump -debug-info - | FileCheck %s +; RUN: llc -filetype=obj -mtriple=powerpc64le-unknown-linux-gnu \ +; RUN: -strict-dwarf=true < %s | llvm-dwarfdump -debug-info - | \ +; RUN: FileCheck %s + +; FIXME: when -strict-dwarf=true is specified, we should check "STRICT" to tell +; that with DWARF 4, we should not generate DWARF 5 attribute DW_AT_noreturn and +; DW_AT_alignment. + +; CHECK: DW_AT_alignment +; CHECK: DW_AT_noreturn +; STRICT-NOT: DW_AT_noreturn +; STRICT-NOT: DW_AT_alignment + +@_ZL3var = internal global i32 0, align 16, !dbg !0 + +; Function Attrs: noinline noreturn optnone uwtable mustprogress +define dso_local void @_Z1fv() #0 !dbg !12 { +entry: + call void @_Z4exitv(), !dbg !15 + ret void, !dbg !16 +} + +declare void @_Z4exitv() + +; Function Attrs: noinline nounwind optnone uwtable mustprogress +define dso_local signext i32 @_Z3foov() !dbg !17 { +entry: + %0 = load i32, i32* @_ZL3var, align 16, !dbg !21 + ret i32 %0, !dbg !22 +} + +!llvm.dbg.cu = !{!2} +!llvm.module.flags = !{!7, !8, !9, !10} +!llvm.ident = !{!11} + +!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression()) +!1 = distinct !DIGlobalVariable(name: "var", linkageName: "_ZL3var", scope: !2, file: !3, line: 2, type: !6, isLocal: true, isDefinition: true, align: 128) +!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !3, producer: "clang version 13.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !5, splitDebugInlining: false, nameTableKind: None) +!3 = !DIFile(filename: "t.cpp", directory: "./") +!4 = !{} +!5 = !{!0} +!6 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned) +!7 = !{i32 7, !"Dwarf Version", i32 4} +!8 = !{i32 2, !"Debug Info Version", i32 3} +!9 = !{i32 1, !"wchar_size", i32 4} +!10 = !{i32 7, !"uwtable", i32 1} +!11 = !{!"clang version 13.0.0"} +!12 = distinct !DISubprogram(name: "f", linkageName: "_Z1fv", scope: !3, file: !3, line: 4, type: !13, scopeLine: 4, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !4) +!13 = !DISubroutineType(types: !14) +!14 = !{null} +!15 = !DILocation(line: 5, column: 1, scope: !12) +!16 = !DILocation(line: 7, column: 1, scope: !12) +!17 = distinct !DISubprogram(name: "foo", linkageName: "_Z3foov", scope: !3, file: !3, line: 10, type: !18, scopeLine: 11, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !4) +!18 = !DISubroutineType(types: !19) +!19 = !{!20} +!20 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +!21 = !DILocation(line: 12, column: 18, scope: !17) +!22 = !DILocation(line: 12, column: 11, scope: !17) -- 2.7.4