carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 08:31:04 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix debug location for variable allocas and lifetime markers. (#5432)

Browse Source 
`IRBuilderBase::SetInsertPoint` weirdly replaces our debug location with
one copied from the new insertion point, so undo its damage after
calling it.

Also included: a couple of cleanups I made while tracking this down.
This commit is contained in:
Richard Smith
2025-05-06 21:26:59 +00:00
committed by GitHub
parent 7b9ec95118
commit 32e68cfb5b
33 changed files with 1511 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lower/testdata/function/generic/call_recursive_basic.carbon
Vendored
+82 -80
View File
@@ -43,83 +43,83 @@ fn M() {
// CHECK:STDOUT: define void @_CM.Main() !dbg !4 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %n.var = alloca i32, align 4, !dbg !7
// CHECK:STDOUT: %m.var = alloca double, align 8, !dbg !7
// CHECK:STDOUT: %ptr_i32.var = alloca ptr, align 8, !dbg !7
// CHECK:STDOUT: %ptr_f64.var = alloca ptr, align 8, !dbg !7
// CHECK:STDOUT: %m.var = alloca double, align 8, !dbg !8
// CHECK:STDOUT: %ptr_i32.var = alloca ptr, align 8, !dbg !9
// CHECK:STDOUT: %ptr_f64.var = alloca ptr, align 8, !dbg !10
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(i64 4, ptr %n.var), !dbg !7
// CHECK:STDOUT: store i32 0, ptr %n.var, align 4, !dbg !7
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(i64 8, ptr %m.var), !dbg !7
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(i64 8, ptr %m.var), !dbg !8
// CHECK:STDOUT: store double 1.000000e+00, ptr %m.var, align 8, !dbg !8
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(i64 8, ptr %ptr_i32.var), !dbg !7
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(i64 8, ptr %ptr_f64.var), !dbg !7
// CHECK:STDOUT: %.loc28_5 = load i32, ptr %n.var, align 4, !dbg !9
// CHECK:STDOUT: %F.call.loc28 = call i32 @_CF.Main.b88d1103f417c6d4(i32 %.loc28_5, i32 0), !dbg !10
// CHECK:STDOUT: %.loc29_5 = load double, ptr %m.var, align 8, !dbg !11
// CHECK:STDOUT: %F.call.loc29 = call double @_CF.Main.66be507887ceee78(double %.loc29_5, i32 0), !dbg !12
// CHECK:STDOUT: %.loc30_5 = load ptr, ptr %ptr_i32.var, align 8, !dbg !13
// CHECK:STDOUT: %F.call.loc30 = call ptr @_CF.Main.e8193710fd35b608(ptr %.loc30_5, i32 0), !dbg !14
// CHECK:STDOUT: %.loc31_5 = load ptr, ptr %ptr_f64.var, align 8, !dbg !15
// CHECK:STDOUT: %F.call.loc31 = call ptr @_CF.Main.04bf2edaaa84aa22(ptr %.loc31_5, i32 0), !dbg !16
// CHECK:STDOUT: ret void, !dbg !17
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(i64 8, ptr %ptr_i32.var), !dbg !9
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(i64 8, ptr %ptr_f64.var), !dbg !10
// CHECK:STDOUT: %.loc28_5 = load i32, ptr %n.var, align 4, !dbg !11
// CHECK:STDOUT: %F.call.loc28 = call i32 @_CF.Main.b88d1103f417c6d4(i32 %.loc28_5, i32 0), !dbg !12
// CHECK:STDOUT: %.loc29_5 = load double, ptr %m.var, align 8, !dbg !13
// CHECK:STDOUT: %F.call.loc29 = call double @_CF.Main.66be507887ceee78(double %.loc29_5, i32 0), !dbg !14
// CHECK:STDOUT: %.loc30_5 = load ptr, ptr %ptr_i32.var, align 8, !dbg !15
// CHECK:STDOUT: %F.call.loc30 = call ptr @_CF.Main.e8193710fd35b608(ptr %.loc30_5, i32 0), !dbg !16
// CHECK:STDOUT: %.loc31_5 = load ptr, ptr %ptr_f64.var, align 8, !dbg !17
// CHECK:STDOUT: %F.call.loc31 = call ptr @_CF.Main.04bf2edaaa84aa22(ptr %.loc31_5, i32 0), !dbg !18
// CHECK:STDOUT: ret void, !dbg !19
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nocallback nofree nosync nounwind willreturn memory(argmem: readwrite)
// CHECK:STDOUT: declare void @llvm.lifetime.start.p0(i64 immarg, ptr captures(none)) #0
// CHECK:STDOUT:
// CHECK:STDOUT: define i32 @_CF.Main.b88d1103f417c6d4(i32 %x, i32 %count) !dbg !18 {
// CHECK:STDOUT: define i32 @_CF.Main.b88d1103f417c6d4(i32 %x, i32 %count) !dbg !20 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %int.greater = icmp sgt i32 %count, 0, !dbg !19
// CHECK:STDOUT: br i1 %int.greater, label %if.then, label %if.else, !dbg !20
// CHECK:STDOUT: %int.greater = icmp sgt i32 %count, 0, !dbg !21
// CHECK:STDOUT: br i1 %int.greater, label %if.then, label %if.else, !dbg !22
// CHECK:STDOUT:
// CHECK:STDOUT: if.then: ; preds = %entry
// CHECK:STDOUT: ret i32 %x, !dbg !21
// CHECK:STDOUT: ret i32 %x, !dbg !23
// CHECK:STDOUT:
// CHECK:STDOUT: if.else: ; preds = %entry
// CHECK:STDOUT: %int.sadd = add i32 %count, 1, !dbg !22
// CHECK:STDOUT: %F.call = call i32 @_CF.Main.b88d1103f417c6d4(i32 %x, i32 %int.sadd), !dbg !23
// CHECK:STDOUT: ret i32 %F.call, !dbg !24
// CHECK:STDOUT: %int.sadd = add i32 %count, 1, !dbg !24
// CHECK:STDOUT: %F.call = call i32 @_CF.Main.b88d1103f417c6d4(i32 %x, i32 %int.sadd), !dbg !25
// CHECK:STDOUT: ret i32 %F.call, !dbg !26
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: define double @_CF.Main.66be507887ceee78(double %x, i32 %count) !dbg !25 {
// CHECK:STDOUT: define double @_CF.Main.66be507887ceee78(double %x, i32 %count) !dbg !27 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %int.greater = icmp sgt i32 %count, 0, !dbg !26
// CHECK:STDOUT: br i1 %int.greater, label %if.then, label %if.else, !dbg !27
// CHECK:STDOUT: %int.greater = icmp sgt i32 %count, 0, !dbg !28
// CHECK:STDOUT: br i1 %int.greater, label %if.then, label %if.else, !dbg !29
// CHECK:STDOUT:
// CHECK:STDOUT: if.then: ; preds = %entry
// CHECK:STDOUT: ret double %x, !dbg !28
// CHECK:STDOUT: ret double %x, !dbg !30
// CHECK:STDOUT:
// CHECK:STDOUT: if.else: ; preds = %entry
// CHECK:STDOUT: %int.sadd = add i32 %count, 1, !dbg !29
// CHECK:STDOUT: %F.call = call double @_CF.Main.66be507887ceee78(double %x, i32 %int.sadd), !dbg !30
// CHECK:STDOUT: ret double %F.call, !dbg !31
// CHECK:STDOUT: %int.sadd = add i32 %count, 1, !dbg !31
// CHECK:STDOUT: %F.call = call double @_CF.Main.66be507887ceee78(double %x, i32 %int.sadd), !dbg !32
// CHECK:STDOUT: ret double %F.call, !dbg !33
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: define ptr @_CF.Main.e8193710fd35b608(ptr %x, i32 %count) !dbg !32 {
// CHECK:STDOUT: define ptr @_CF.Main.e8193710fd35b608(ptr %x, i32 %count) !dbg !34 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %int.greater = icmp sgt i32 %count, 0, !dbg !33
// CHECK:STDOUT: br i1 %int.greater, label %if.then, label %if.else, !dbg !34
// CHECK:STDOUT: %int.greater = icmp sgt i32 %count, 0, !dbg !35
// CHECK:STDOUT: br i1 %int.greater, label %if.then, label %if.else, !dbg !36
// CHECK:STDOUT:
// CHECK:STDOUT: if.then: ; preds = %entry
// CHECK:STDOUT: ret ptr %x, !dbg !35
// CHECK:STDOUT: ret ptr %x, !dbg !37
// CHECK:STDOUT:
// CHECK:STDOUT: if.else: ; preds = %entry
// CHECK:STDOUT: %int.sadd = add i32 %count, 1, !dbg !36
// CHECK:STDOUT: %F.call = call ptr @_CF.Main.e8193710fd35b608(ptr %x, i32 %int.sadd), !dbg !37
// CHECK:STDOUT: ret ptr %F.call, !dbg !38
// CHECK:STDOUT: %int.sadd = add i32 %count, 1, !dbg !38
// CHECK:STDOUT: %F.call = call ptr @_CF.Main.e8193710fd35b608(ptr %x, i32 %int.sadd), !dbg !39
// CHECK:STDOUT: ret ptr %F.call, !dbg !40
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: define ptr @_CF.Main.04bf2edaaa84aa22(ptr %x, i32 %count) !dbg !39 {
// CHECK:STDOUT: define ptr @_CF.Main.04bf2edaaa84aa22(ptr %x, i32 %count) !dbg !41 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %int.greater = icmp sgt i32 %count, 0, !dbg !40
// CHECK:STDOUT: br i1 %int.greater, label %if.then, label %if.else, !dbg !41
// CHECK:STDOUT: %int.greater = icmp sgt i32 %count, 0, !dbg !42
// CHECK:STDOUT: br i1 %int.greater, label %if.then, label %if.else, !dbg !43
// CHECK:STDOUT:
// CHECK:STDOUT: if.then: ; preds = %entry
// CHECK:STDOUT: ret ptr %x, !dbg !42
// CHECK:STDOUT: ret ptr %x, !dbg !44
// CHECK:STDOUT:
// CHECK:STDOUT: if.else: ; preds = %entry
// CHECK:STDOUT: %int.sadd = add i32 %count, 1, !dbg !43
// CHECK:STDOUT: %F.call = call ptr @_CF.Main.04bf2edaaa84aa22(ptr %x, i32 %int.sadd), !dbg !44
// CHECK:STDOUT: ret ptr %F.call, !dbg !45
// CHECK:STDOUT: %int.sadd = add i32 %count, 1, !dbg !45
// CHECK:STDOUT: %F.call = call ptr @_CF.Main.04bf2edaaa84aa22(ptr %x, i32 %int.sadd), !dbg !46
// CHECK:STDOUT: ret ptr %F.call, !dbg !47
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; uselistorder directives
@@ -139,40 +139,42 @@ fn M() {
// CHECK:STDOUT: !6 = !{}
// CHECK:STDOUT: !7 = !DILocation(line: 23, column: 3, scope: !4)
// CHECK:STDOUT: !8 = !DILocation(line: 24, column: 3, scope: !4)
// CHECK:STDOUT: !9 = !DILocation(line: 28, column: 5, scope: !4)
// CHECK:STDOUT: !10 = !DILocation(line: 28, column: 3, scope: !4)
// CHECK:STDOUT: !11 = !DILocation(line: 29, column: 5, scope: !4)
// CHECK:STDOUT: !12 = !DILocation(line: 29, column: 3, scope: !4)
// CHECK:STDOUT: !13 = !DILocation(line: 30, column: 5, scope: !4)
// CHECK:STDOUT: !14 = !DILocation(line: 30, column: 3, scope: !4)
// CHECK:STDOUT: !15 = !DILocation(line: 31, column: 5, scope: !4)
// CHECK:STDOUT: !16 = !DILocation(line: 31, column: 3, scope: !4)
// CHECK:STDOUT: !17 = !DILocation(line: 22, column: 1, scope: !4)
// CHECK:STDOUT: !18 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.b88d1103f417c6d4", scope: null, file: !3, line: 15, type: !5, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !19 = !DILocation(line: 16, column: 7, scope: !18)
// CHECK:STDOUT: !20 = !DILocation(line: 16, column: 6, scope: !18)
// CHECK:STDOUT: !21 = !DILocation(line: 17, column: 5, scope: !18)
// CHECK:STDOUT: !22 = !DILocation(line: 19, column: 15, scope: !18)
// CHECK:STDOUT: !23 = !DILocation(line: 19, column: 10, scope: !18)
// CHECK:STDOUT: !24 = !DILocation(line: 19, column: 3, scope: !18)
// CHECK:STDOUT: !25 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.66be507887ceee78", scope: null, file: !3, line: 15, type: !5, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !26 = !DILocation(line: 16, column: 7, scope: !25)
// CHECK:STDOUT: !27 = !DILocation(line: 16, column: 6, scope: !25)
// CHECK:STDOUT: !28 = !DILocation(line: 17, column: 5, scope: !25)
// CHECK:STDOUT: !29 = !DILocation(line: 19, column: 15, scope: !25)
// CHECK:STDOUT: !30 = !DILocation(line: 19, column: 10, scope: !25)
// CHECK:STDOUT: !31 = !DILocation(line: 19, column: 3, scope: !25)
// CHECK:STDOUT: !32 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.e8193710fd35b608", scope: null, file: !3, line: 15, type: !5, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !33 = !DILocation(line: 16, column: 7, scope: !32)
// CHECK:STDOUT: !34 = !DILocation(line: 16, column: 6, scope: !32)
// CHECK:STDOUT: !35 = !DILocation(line: 17, column: 5, scope: !32)
// CHECK:STDOUT: !36 = !DILocation(line: 19, column: 15, scope: !32)
// CHECK:STDOUT: !37 = !DILocation(line: 19, column: 10, scope: !32)
// CHECK:STDOUT: !38 = !DILocation(line: 19, column: 3, scope: !32)
// CHECK:STDOUT: !39 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.04bf2edaaa84aa22", scope: null, file: !3, line: 15, type: !5, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !40 = !DILocation(line: 16, column: 7, scope: !39)
// CHECK:STDOUT: !41 = !DILocation(line: 16, column: 6, scope: !39)
// CHECK:STDOUT: !42 = !DILocation(line: 17, column: 5, scope: !39)
// CHECK:STDOUT: !43 = !DILocation(line: 19, column: 15, scope: !39)
// CHECK:STDOUT: !44 = !DILocation(line: 19, column: 10, scope: !39)
// CHECK:STDOUT: !45 = !DILocation(line: 19, column: 3, scope: !39)
// CHECK:STDOUT: !9 = !DILocation(line: 25, column: 3, scope: !4)
// CHECK:STDOUT: !10 = !DILocation(line: 26, column: 3, scope: !4)
// CHECK:STDOUT: !11 = !DILocation(line: 28, column: 5, scope: !4)
// CHECK:STDOUT: !12 = !DILocation(line: 28, column: 3, scope: !4)
// CHECK:STDOUT: !13 = !DILocation(line: 29, column: 5, scope: !4)
// CHECK:STDOUT: !14 = !DILocation(line: 29, column: 3, scope: !4)
// CHECK:STDOUT: !15 = !DILocation(line: 30, column: 5, scope: !4)
// CHECK:STDOUT: !16 = !DILocation(line: 30, column: 3, scope: !4)
// CHECK:STDOUT: !17 = !DILocation(line: 31, column: 5, scope: !4)
// CHECK:STDOUT: !18 = !DILocation(line: 31, column: 3, scope: !4)
// CHECK:STDOUT: !19 = !DILocation(line: 22, column: 1, scope: !4)
// CHECK:STDOUT: !20 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.b88d1103f417c6d4", scope: null, file: !3, line: 15, type: !5, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !21 = !DILocation(line: 16, column: 7, scope: !20)
// CHECK:STDOUT: !22 = !DILocation(line: 16, column: 6, scope: !20)
// CHECK:STDOUT: !23 = !DILocation(line: 17, column: 5, scope: !20)
// CHECK:STDOUT: !24 = !DILocation(line: 19, column: 15, scope: !20)
// CHECK:STDOUT: !25 = !DILocation(line: 19, column: 10, scope: !20)
// CHECK:STDOUT: !26 = !DILocation(line: 19, column: 3, scope: !20)
// CHECK:STDOUT: !27 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.66be507887ceee78", scope: null, file: !3, line: 15, type: !5, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !28 = !DILocation(line: 16, column: 7, scope: !27)
// CHECK:STDOUT: !29 = !DILocation(line: 16, column: 6, scope: !27)
// CHECK:STDOUT: !30 = !DILocation(line: 17, column: 5, scope: !27)
// CHECK:STDOUT: !31 = !DILocation(line: 19, column: 15, scope: !27)
// CHECK:STDOUT: !32 = !DILocation(line: 19, column: 10, scope: !27)
// CHECK:STDOUT: !33 = !DILocation(line: 19, column: 3, scope: !27)
// CHECK:STDOUT: !34 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.e8193710fd35b608", scope: null, file: !3, line: 15, type: !5, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !35 = !DILocation(line: 16, column: 7, scope: !34)
// CHECK:STDOUT: !36 = !DILocation(line: 16, column: 6, scope: !34)
// CHECK:STDOUT: !37 = !DILocation(line: 17, column: 5, scope: !34)
// CHECK:STDOUT: !38 = !DILocation(line: 19, column: 15, scope: !34)
// CHECK:STDOUT: !39 = !DILocation(line: 19, column: 10, scope: !34)
// CHECK:STDOUT: !40 = !DILocation(line: 19, column: 3, scope: !34)
// CHECK:STDOUT: !41 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.04bf2edaaa84aa22", scope: null, file: !3, line: 15, type: !5, spFlags: DISPFlagDefinition, unit: !2)
// CHECK:STDOUT: !42 = !DILocation(line: 16, column: 7, scope: !41)
// CHECK:STDOUT: !43 = !DILocation(line: 16, column: 6, scope: !41)
// CHECK:STDOUT: !44 = !DILocation(line: 17, column: 5, scope: !41)
// CHECK:STDOUT: !45 = !DILocation(line: 19, column: 15, scope: !41)
// CHECK:STDOUT: !46 = !DILocation(line: 19, column: 10, scope: !41)
// CHECK:STDOUT: !47 = !DILocation(line: 19, column: 3, scope: !41)