Skip to content

Commit 35c1e77

Browse files
nilanjana87adrian-prantl
authored andcommitted
Changing representation of .cv_def_range directives in Codeview debug info assembly format for better readability
llvm-svn: 367867 (cherry picked from commit da60fc8) Conflicts: llvm/lib/MC/MCAsmStreamer.cpp llvm/test/DebugInfo/COFF/nrvo.ll
1 parent ab7ae3c commit 35c1e77

File tree

4 files changed

+151
-7
lines changed

4 files changed

+151
-7
lines changed

lld/test/COFF/s_udt.s

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,23 +173,23 @@ main: # @main
173173
.short 1 # Flags
174174
.asciz "argc"
175175
.Ltmp13:
176-
.cv_def_range .Ltmp0 .Ltmp1, "B\021\f\000\000\000"
176+
.cv_def_range .Ltmp0 .Ltmp1, frame_ptr_rel, 12
177177
.short .Ltmp15-.Ltmp14 # Record length
178178
.Ltmp14:
179179
.short 4414 # Record kind: S_LOCAL
180180
.long 4096 # TypeIndex
181181
.short 1 # Flags
182182
.asciz "argv"
183183
.Ltmp15:
184-
.cv_def_range .Ltmp0 .Ltmp1, "B\021\020\000\000\000"
184+
.cv_def_range .Ltmp0 .Ltmp1, frame_ptr_rel, 16
185185
.short .Ltmp17-.Ltmp16 # Record length
186186
.Ltmp16:
187187
.short 4414 # Record kind: S_LOCAL
188188
.long 4101 # TypeIndex
189189
.short 0 # Flags
190190
.asciz "SPtr"
191191
.Ltmp17:
192-
.cv_def_range .Ltmp0 .Ltmp1, "B\021\000\000\000\000"
192+
.cv_def_range .Ltmp0 .Ltmp1, frame_ptr_rel, 0
193193
.short .Ltmp19-.Ltmp18 # Record length
194194
.Ltmp18:
195195
.short 4360 # Record kind: S_UDT

lldb/lit/SymbolFile/NativePDB/Inputs/s_constant.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,15 @@ GlobalSSEC: # @GlobalSSEC
165165
.short 1 # Flags
166166
.asciz "argc"
167167
.Ltmp13:
168-
.cv_def_range .Ltmp0 .Ltmp1, "B\021\004\000\000\000"
168+
.cv_def_range .Ltmp0 .Ltmp1, frame_ptr_rel, 4
169169
.short .Ltmp15-.Ltmp14 # Record length
170170
.Ltmp14:
171171
.short 4414 # Record kind: S_LOCAL
172172
.long 4096 # TypeIndex
173173
.short 1 # Flags
174174
.asciz "argv"
175175
.Ltmp15:
176-
.cv_def_range .Ltmp0 .Ltmp1, "B\021\b\000\000\000"
176+
.cv_def_range .Ltmp0 .Ltmp1, frame_ptr_rel, 8
177177
.short 2 # Record length
178178
.short 4431 # Record kind: S_PROC_ID_END
179179
.Ltmp7:

lldb/source/Plugins/SymbolFile/NativePDB/PdbUtil.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,14 +641,14 @@ VariableInfo lldb_private::npdb::GetVariableLocationInfo(
641641
llvm::StringRef program;
642642
if (GetFrameDataProgram(index, ranges, program)) {
643643
result.location =
644-
MakeVFrameRelLocationExpression(program, loc.Offset, module);
644+
MakeVFrameRelLocationExpression(program, loc.Hdr.Offset, module);
645645
result.ranges = std::move(ranges);
646646
} else {
647647
// invalid variable
648648
}
649649
} else {
650650
result.location =
651-
MakeRegRelLocationExpression(base_reg, loc.Offset, module);
651+
MakeRegRelLocationExpression(base_reg, loc.Hdr.Offset, module);
652652
result.ranges = std::move(ranges);
653653
}
654654
} else if (loc_specifier_cvs.kind() == S_DEFRANGE_REGISTER_REL) {

llvm/test/DebugInfo/COFF/nrvo.ll

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
; RUN: llc < %s | FileCheck %s --check-prefix=ASM
2+
; RUN: llc < %s -filetype=obj | llvm-readobj - --codeview | FileCheck %s --check-prefix=OBJ
3+
4+
; C++ source to regenerate:
5+
; struct Foo {
6+
; Foo() = default;
7+
; Foo(Foo &&other) { x = other.x; }
8+
; int x;
9+
; };
10+
; void some_function(int);
11+
; Foo getFoo() {
12+
; Foo foo;
13+
; foo.x = 41;
14+
; some_function(foo.x);
15+
; return foo;
16+
; }
17+
;
18+
; int main() {
19+
; Foo bar = getFoo();
20+
; return bar.x;
21+
; }
22+
; $ clang t.cpp -S -emit-llvm -g -o t.ll
23+
24+
; ASM-LABEL: .long 241 # Symbol subsection for GetFoo
25+
; ASM: .short 4414 # Record kind: S_LOCAL
26+
; ASM-NEXT: .long 4113 # TypeIndex
27+
; ASM-NEXT: .short 0 # Flags
28+
; ASM-NEXT: .asciz "foo"
29+
; ASM-NEXT: .p2align 2
30+
; ASM-NEXT: .Ltmp
31+
; ASM: .cv_def_range .Ltmp{{.*}} .Ltmp{{.*}}, frame_ptr_rel, 40
32+
33+
; OBJ: Subsection [
34+
; OBJ: SubSectionType: Symbols (0xF1)
35+
; OBJ: LocalSym {
36+
; OBJ: Kind: S_LOCAL (0x113E)
37+
; OBJ: Type: Foo& (0x1011)
38+
; OBJ: Flags [ (0x0)
39+
; OBJ: ]
40+
; OBJ: VarName: foo
41+
; OBJ: }
42+
; OBJ: DefRangeFramePointerRelSym {
43+
; OBJ: Kind: S_DEFRANGE_FRAMEPOINTER_REL (0x1142)
44+
; OBJ: Offset: 40
45+
; OBJ: LocalVariableAddrRange {
46+
; OBJ: OffsetStart: .text+0x1D
47+
; OBJ: ISectStart: 0x0
48+
; OBJ: Range: 0x16
49+
; OBJ: }
50+
51+
; ModuleID = 't.cpp'
52+
source_filename = "t.cpp"
53+
target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
54+
target triple = "x86_64-pc-windows-msvc19.16.27030"
55+
56+
%struct.Foo = type { i32 }
57+
58+
; Function Attrs: noinline nounwind optnone uwtable
59+
define dso_local void @"?some_function@@YAXH@Z"(i32) #0 !dbg !8 {
60+
entry:
61+
%.addr = alloca i32, align 4
62+
store i32 %0, i32* %.addr, align 4
63+
call void @llvm.dbg.declare(metadata i32* %.addr, metadata !12, metadata !DIExpression()), !dbg !13
64+
ret void, !dbg !13
65+
}
66+
67+
; Function Attrs: nounwind readnone speculatable
68+
declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
69+
70+
; Function Attrs: noinline nounwind optnone uwtable
71+
define dso_local void @"?GetFoo@@YA?AUFoo@@XZ"(%struct.Foo* noalias sret %agg.result) #0 !dbg !14 {
72+
entry:
73+
%result.ptr = alloca i8*, align 8
74+
%0 = bitcast %struct.Foo* %agg.result to i8*
75+
store i8* %0, i8** %result.ptr, align 8
76+
call void @llvm.dbg.declare(metadata i8** %result.ptr, metadata !28, metadata !DIExpression(DW_OP_deref)), !dbg !29
77+
%x = getelementptr inbounds %struct.Foo, %struct.Foo* %agg.result, i32 0, i32 0, !dbg !30
78+
store i32 41, i32* %x, align 4, !dbg !30
79+
%x1 = getelementptr inbounds %struct.Foo, %struct.Foo* %agg.result, i32 0, i32 0, !dbg !31
80+
%1 = load i32, i32* %x1, align 4, !dbg !31
81+
call void @"?some_function@@YAXH@Z"(i32 %1), !dbg !31
82+
ret void, !dbg !32
83+
}
84+
85+
; Function Attrs: noinline norecurse nounwind optnone uwtable
86+
define dso_local i32 @main() #2 !dbg !33 {
87+
entry:
88+
%retval = alloca i32, align 4
89+
%bar = alloca %struct.Foo, align 4
90+
store i32 0, i32* %retval, align 4
91+
call void @llvm.dbg.declare(metadata %struct.Foo* %bar, metadata !36, metadata !DIExpression()), !dbg !37
92+
call void @"?GetFoo@@YA?AUFoo@@XZ"(%struct.Foo* sret %bar), !dbg !37
93+
%x = getelementptr inbounds %struct.Foo, %struct.Foo* %bar, i32 0, i32 0, !dbg !38
94+
%0 = load i32, i32* %x, align 4, !dbg !38
95+
ret i32 %0, !dbg !38
96+
}
97+
98+
attributes #0 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
99+
attributes #1 = { nounwind readnone speculatable }
100+
attributes #2 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
101+
102+
!llvm.dbg.cu = !{!0}
103+
!llvm.module.flags = !{!3, !4, !5, !6}
104+
!llvm.ident = !{!7}
105+
106+
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 9.0.0 (https://github.com/llvm/llvm-project.git c19ebebac4bf853e77a69c74abe9f7fce98c1d17)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
107+
!1 = !DIFile(filename: "t.cpp", directory: "C:\5Csrc\5Ctesting\5Cnrvo", checksumkind: CSK_MD5, checksum: "52a5a20c02c102dfd255d5615680a8bd")
108+
!2 = !{}
109+
!3 = !{i32 2, !"CodeView", i32 1}
110+
!4 = !{i32 2, !"Debug Info Version", i32 3}
111+
!5 = !{i32 1, !"wchar_size", i32 2}
112+
!6 = !{i32 7, !"PIC Level", i32 2}
113+
!7 = !{!"clang version 9.0.0 (https://github.com/llvm/llvm-project.git c19ebebac4bf853e77a69c74abe9f7fce98c1d17)"}
114+
!8 = distinct !DISubprogram(name: "some_function", linkageName: "?some_function@@YAXH@Z", scope: !1, file: !1, line: 13, type: !9, scopeLine: 13, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
115+
!9 = !DISubroutineType(types: !10)
116+
!10 = !{null, !11}
117+
!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
118+
!12 = !DILocalVariable(arg: 1, scope: !8, file: !1, line: 13, type: !11)
119+
!13 = !DILocation(line: 13, scope: !8)
120+
!14 = distinct !DISubprogram(name: "GetFoo", linkageName: "?GetFoo@@YA?AUFoo@@XZ", scope: !1, file: !1, line: 15, type: !15, scopeLine: 15, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
121+
!15 = !DISubroutineType(types: !16)
122+
!16 = !{!17}
123+
!17 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo", file: !1, line: 1, size: 32, flags: DIFlagTypePassByReference | DIFlagNonTrivial, elements: !18, identifier: ".?AUFoo@@")
124+
!18 = !{!19, !20, !24}
125+
!19 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !17, file: !1, line: 4, baseType: !11, size: 32)
126+
!20 = !DISubprogram(name: "Foo", scope: !17, file: !1, line: 2, type: !21, scopeLine: 2, flags: DIFlagPrototyped, spFlags: 0)
127+
!21 = !DISubroutineType(types: !22)
128+
!22 = !{null, !23}
129+
!23 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !17, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
130+
!24 = !DISubprogram(name: "Foo", scope: !17, file: !1, line: 3, type: !25, scopeLine: 3, flags: DIFlagPrototyped, spFlags: 0)
131+
!25 = !DISubroutineType(types: !26)
132+
!26 = !{null, !23, !27}
133+
!27 = !DIDerivedType(tag: DW_TAG_rvalue_reference_type, baseType: !17, size: 64)
134+
!28 = !DILocalVariable(name: "foo", scope: !14, file: !1, line: 17, type: !17)
135+
!29 = !DILocation(line: 17, scope: !14)
136+
!30 = !DILocation(line: 18, scope: !14)
137+
!31 = !DILocation(line: 19, scope: !14)
138+
!32 = !DILocation(line: 21, scope: !14)
139+
!33 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 23, type: !34, scopeLine: 23, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
140+
!34 = !DISubroutineType(types: !35)
141+
!35 = !{!11}
142+
!36 = !DILocalVariable(name: "bar", scope: !33, file: !1, line: 24, type: !17)
143+
!37 = !DILocation(line: 24, scope: !33)
144+
!38 = !DILocation(line: 25, scope: !33)

0 commit comments

Comments
 (0)