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

Don't include the library name in most fingerprints. (#7292)

Browse Source 
When we import from another library in the same package, its entities
end up with our library as their parent scope, resulting in cross-file
fingerprint mismatches. Instead, only include the library ID when
fingerprinting either a package-private entity or an `ImportIRId` that
refers to a particular `SemIR::File`.
This commit is contained in:
Richard Smith
2026-06-02 19:31:30 +00:00
committed by GitHub
parent e7ed217d4e
commit f5e9c61f11
640 changed files with 50114 additions and 49559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lower/testdata/function/generic/call_recursive_basic.carbon
Vendored
+29 -29
View File
@@ -70,38 +70,38 @@ fn M() {
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %ptr_f64.var), !dbg !17
// CHECK:STDOUT: store ptr %m.var, ptr %ptr_f64.var, align 8, !dbg !17
// CHECK:STDOUT: %.loc34_5 = load i32, ptr %n.var, align 4, !dbg !20
// CHECK:STDOUT: %F.call.loc34 = call i32 @_CF.Main.986e4fbf737c841b(i32 %.loc34_5, i32 0), !dbg !21
// CHECK:STDOUT: %F.call.loc34 = call i32 @_CF.Main.4bee6dcdea6ba756(i32 %.loc34_5, i32 0), !dbg !21
// CHECK:STDOUT: %.loc35_5 = load double, ptr %m.var, align 8, !dbg !22
// CHECK:STDOUT: %F.call.loc35 = call double @_CF.Main.c6ad9461f716a4dc(double %.loc35_5, i32 0), !dbg !23
// CHECK:STDOUT: %F.call.loc35 = call double @_CF.Main.925563b151bf93f6(double %.loc35_5, i32 0), !dbg !23
// CHECK:STDOUT: %.loc36_5 = load ptr, ptr %ptr_i32.var, align 8, !dbg !24
// CHECK:STDOUT: %F.call.loc36 = call ptr @_CF.Main.c6a12952cc402d96(ptr %.loc36_5, i32 0), !dbg !25
// CHECK:STDOUT: %F.call.loc36 = call ptr @_CF.Main.a87c59609561b819(ptr %.loc36_5, i32 0), !dbg !25
// CHECK:STDOUT: %.loc37_5 = load ptr, ptr %ptr_f64.var, align 8, !dbg !26
// CHECK:STDOUT: %F.call.loc37 = call ptr @_CF.Main.c6a12952cc402d96(ptr %.loc37_5, i32 0), !dbg !27
// CHECK:STDOUT: %F.call.loc37 = call ptr @_CF.Main.a87c59609561b819(ptr %.loc37_5, i32 0), !dbg !27
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %c.var), !dbg !18
// CHECK:STDOUT: call void @llvm.memcpy.p0.p0.i64(ptr align 1 %c.var, ptr align 1 @C.val.loc15_51, i64 0, i1 false), !dbg !18
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %.loc40_9.2.temp), !dbg !19
// CHECK:STDOUT: call void @_CF.Main.cbacb6af70d3d312(ptr %.loc40_9.2.temp, ptr %c.var, i32 0), !dbg !19
// CHECK:STDOUT: call void @"_COp.b8b1f433ad216ca6:core.Destroy.Core"(ptr %.loc40_9.2.temp), !dbg !19
// CHECK:STDOUT: call void @"_COp.b8b1f433ad216ca6:core.Destroy.Core"(ptr %c.var), !dbg !18
// CHECK:STDOUT: call void @"_COp.b46d7363edf385cc:core.Destroy.Core"(ptr %m.var), !dbg !15
// CHECK:STDOUT: call void @"_COp.94e3ca86614aba5d:core.Destroy.Core"(ptr %n.var), !dbg !14
// CHECK:STDOUT: call void @_CF.Main.23ea5646f3728a97(ptr %.loc40_9.2.temp, ptr %c.var, i32 0), !dbg !19
// CHECK:STDOUT: call void @"_COp.907c496eccf2294c:core.Destroy.Core"(ptr %.loc40_9.2.temp), !dbg !19
// CHECK:STDOUT: call void @"_COp.907c496eccf2294c:core.Destroy.Core"(ptr %c.var), !dbg !18
// CHECK:STDOUT: call void @"_COp.1e4fc30ecea9aa7e:core.Destroy.Core"(ptr %m.var), !dbg !15
// CHECK:STDOUT: call void @"_COp.1fa36cd3e044ac37:core.Destroy.Core"(ptr %n.var), !dbg !14
// CHECK:STDOUT: ret void, !dbg !28
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define weak_odr void @"_COp.b8b1f433ad216ca6:core.Destroy.Core"(ptr %self) #0 !dbg !29 {
// CHECK:STDOUT: define weak_odr void @"_COp.907c496eccf2294c:core.Destroy.Core"(ptr %self) #0 !dbg !29 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: ret void, !dbg !34
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define weak_odr void @"_COp.b46d7363edf385cc:core.Destroy.Core"(ptr %self) #0 !dbg !35 {
// CHECK:STDOUT: define weak_odr void @"_COp.1e4fc30ecea9aa7e:core.Destroy.Core"(ptr %self) #0 !dbg !35 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: ret void, !dbg !38
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define weak_odr void @"_COp.94e3ca86614aba5d:core.Destroy.Core"(ptr %self) #0 !dbg !39 {
// CHECK:STDOUT: define weak_odr void @"_COp.1fa36cd3e044ac37:core.Destroy.Core"(ptr %self) #0 !dbg !39 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: ret void, !dbg !45
// CHECK:STDOUT: }
@@ -113,7 +113,7 @@ fn M() {
// CHECK:STDOUT: declare void @llvm.lifetime.start.p0(ptr captures(none)) #1
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define linkonce_odr i32 @_CF.Main.986e4fbf737c841b(i32 %x, i32 %count) #0 !dbg !46 {
// CHECK:STDOUT: define linkonce_odr i32 @_CF.Main.4bee6dcdea6ba756(i32 %x, i32 %count) #0 !dbg !46 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %Int.as.OrderedWith.impl.Greater.call = icmp sgt i32 %count, 0, !dbg !52
// CHECK:STDOUT: br i1 %Int.as.OrderedWith.impl.Greater.call, label %if.then, label %if.else, !dbg !53
@@ -123,12 +123,12 @@ fn M() {
// CHECK:STDOUT:
// CHECK:STDOUT: if.else: ; preds = %entry
// CHECK:STDOUT: %Int.as.AddWith.impl.Op.call = add i32 %count, 1, !dbg !55
// CHECK:STDOUT: %F.call = call i32 @_CF.Main.986e4fbf737c841b(i32 %x, i32 %Int.as.AddWith.impl.Op.call), !dbg !56
// CHECK:STDOUT: %F.call = call i32 @_CF.Main.4bee6dcdea6ba756(i32 %x, i32 %Int.as.AddWith.impl.Op.call), !dbg !56
// CHECK:STDOUT: ret i32 %F.call, !dbg !57
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define linkonce_odr double @_CF.Main.c6ad9461f716a4dc(double %x, i32 %count) #0 !dbg !58 {
// CHECK:STDOUT: define linkonce_odr double @_CF.Main.925563b151bf93f6(double %x, i32 %count) #0 !dbg !58 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %Int.as.OrderedWith.impl.Greater.call = icmp sgt i32 %count, 0, !dbg !64
// CHECK:STDOUT: br i1 %Int.as.OrderedWith.impl.Greater.call, label %if.then, label %if.else, !dbg !65
@@ -138,12 +138,12 @@ fn M() {
// CHECK:STDOUT:
// CHECK:STDOUT: if.else: ; preds = %entry
// CHECK:STDOUT: %Int.as.AddWith.impl.Op.call = add i32 %count, 1, !dbg !67
// CHECK:STDOUT: %F.call = call double @_CF.Main.c6ad9461f716a4dc(double %x, i32 %Int.as.AddWith.impl.Op.call), !dbg !68
// CHECK:STDOUT: %F.call = call double @_CF.Main.925563b151bf93f6(double %x, i32 %Int.as.AddWith.impl.Op.call), !dbg !68
// CHECK:STDOUT: ret double %F.call, !dbg !69
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define linkonce_odr ptr @_CF.Main.c6a12952cc402d96(ptr %x, i32 %count) #0 !dbg !70 {
// CHECK:STDOUT: define linkonce_odr ptr @_CF.Main.a87c59609561b819(ptr %x, i32 %count) #0 !dbg !70 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %Int.as.OrderedWith.impl.Greater.call = icmp sgt i32 %count, 0, !dbg !74
// CHECK:STDOUT: br i1 %Int.as.OrderedWith.impl.Greater.call, label %if.then, label %if.else, !dbg !75
@@ -153,12 +153,12 @@ fn M() {
// CHECK:STDOUT:
// CHECK:STDOUT: if.else: ; preds = %entry
// CHECK:STDOUT: %Int.as.AddWith.impl.Op.call = add i32 %count, 1, !dbg !77
// CHECK:STDOUT: %F.call = call ptr @_CF.Main.c6a12952cc402d96(ptr %x, i32 %Int.as.AddWith.impl.Op.call), !dbg !78
// CHECK:STDOUT: %F.call = call ptr @_CF.Main.a87c59609561b819(ptr %x, i32 %Int.as.AddWith.impl.Op.call), !dbg !78
// CHECK:STDOUT: ret ptr %F.call, !dbg !79
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define linkonce_odr void @_CF.Main.cbacb6af70d3d312(ptr sret({}) %return, ptr %x, i32 %count) #0 !dbg !80 {
// CHECK:STDOUT: define linkonce_odr void @_CF.Main.23ea5646f3728a97(ptr sret({}) %return, ptr %x, i32 %count) #0 !dbg !80 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %Int.as.OrderedWith.impl.Greater.call = icmp sgt i32 %count, 0, !dbg !84
// CHECK:STDOUT: br i1 %Int.as.OrderedWith.impl.Greater.call, label %if.then, label %if.else, !dbg !85
@@ -169,15 +169,15 @@ fn M() {
// CHECK:STDOUT:
// CHECK:STDOUT: if.else: ; preds = %entry
// CHECK:STDOUT: %Int.as.AddWith.impl.Op.call = add i32 %count, 1, !dbg !88
// CHECK:STDOUT: call void @_CF.Main.cbacb6af70d3d312(ptr %return, ptr %x, i32 %Int.as.AddWith.impl.Op.call), !dbg !89
// CHECK:STDOUT: call void @_CF.Main.23ea5646f3728a97(ptr %return, ptr %x, i32 %Int.as.AddWith.impl.Op.call), !dbg !89
// CHECK:STDOUT: ret void, !dbg !90
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; uselistorder directives
// CHECK:STDOUT: uselistorder ptr @"_COp.b8b1f433ad216ca6:core.Destroy.Core", { 1, 0 }
// CHECK:STDOUT: uselistorder ptr @"_COp.907c496eccf2294c:core.Destroy.Core", { 1, 0 }
// CHECK:STDOUT: uselistorder ptr @llvm.memcpy.p0.p0.i64, { 1, 0 }
// CHECK:STDOUT: uselistorder ptr @llvm.lifetime.start.p0, { 5, 4, 3, 2, 1, 0 }
// CHECK:STDOUT: uselistorder ptr @_CF.Main.c6a12952cc402d96, { 1, 2, 0 }
// CHECK:STDOUT: uselistorder ptr @_CF.Main.a87c59609561b819, { 1, 2, 0 }
// CHECK:STDOUT:
// CHECK:STDOUT: attributes #0 = { nounwind }
// CHECK:STDOUT: attributes #1 = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
@@ -214,24 +214,24 @@ fn M() {
// CHECK:STDOUT: !26 = !DILocation(line: 37, column: 5, scope: !11)
// CHECK:STDOUT: !27 = !DILocation(line: 37, column: 3, scope: !11)
// CHECK:STDOUT: !28 = !DILocation(line: 28, column: 1, scope: !11)
// CHECK:STDOUT: !29 = distinct !DISubprogram(name: "Op", linkageName: "_COp.b8b1f433ad216ca6:core.Destroy.Core", scope: null, file: !3, line: 40, type: !30, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !32)
// CHECK:STDOUT: !29 = distinct !DISubprogram(name: "Op", linkageName: "_COp.907c496eccf2294c:core.Destroy.Core", scope: null, file: !3, line: 40, type: !30, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !32)
// CHECK:STDOUT: !30 = !DISubroutineType(types: !31)
// CHECK:STDOUT: !31 = !{null, !7}
// CHECK:STDOUT: !32 = !{!33}
// CHECK:STDOUT: !33 = !DILocalVariable(arg: 1, scope: !29, type: !7)
// CHECK:STDOUT: !34 = !DILocation(line: 40, column: 3, scope: !29)
// CHECK:STDOUT: !35 = distinct !DISubprogram(name: "Op", linkageName: "_COp.b46d7363edf385cc:core.Destroy.Core", scope: null, file: !3, line: 30, type: !30, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !36)
// CHECK:STDOUT: !35 = distinct !DISubprogram(name: "Op", linkageName: "_COp.1e4fc30ecea9aa7e:core.Destroy.Core", scope: null, file: !3, line: 30, type: !30, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !36)
// CHECK:STDOUT: !36 = !{!37}
// CHECK:STDOUT: !37 = !DILocalVariable(arg: 1, scope: !35, type: !7)
// CHECK:STDOUT: !38 = !DILocation(line: 30, column: 3, scope: !35)
// CHECK:STDOUT: !39 = distinct !DISubprogram(name: "Op", linkageName: "_COp.94e3ca86614aba5d:core.Destroy.Core", scope: null, file: !3, line: 29, type: !40, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !43)
// CHECK:STDOUT: !39 = distinct !DISubprogram(name: "Op", linkageName: "_COp.1fa36cd3e044ac37:core.Destroy.Core", scope: null, file: !3, line: 29, type: !40, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !43)
// CHECK:STDOUT: !40 = !DISubroutineType(types: !41)
// CHECK:STDOUT: !41 = !{null, !42}
// CHECK:STDOUT: !42 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
// CHECK:STDOUT: !43 = !{!44}
// CHECK:STDOUT: !44 = !DILocalVariable(arg: 1, scope: !39, type: !42)
// CHECK:STDOUT: !45 = !DILocation(line: 29, column: 3, scope: !39)
// CHECK:STDOUT: !46 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.986e4fbf737c841b", scope: null, file: !3, line: 21, type: !47, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !49)
// CHECK:STDOUT: !46 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.4bee6dcdea6ba756", scope: null, file: !3, line: 21, type: !47, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !49)
// CHECK:STDOUT: !47 = !DISubroutineType(types: !48)
// CHECK:STDOUT: !48 = !{!42, !42, !42}
// CHECK:STDOUT: !49 = !{!50, !51}
@@ -243,7 +243,7 @@ fn M() {
// CHECK:STDOUT: !55 = !DILocation(line: 25, column: 15, scope: !46)
// CHECK:STDOUT: !56 = !DILocation(line: 25, column: 10, scope: !46)
// CHECK:STDOUT: !57 = !DILocation(line: 25, column: 3, scope: !46)
// CHECK:STDOUT: !58 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.c6ad9461f716a4dc", scope: null, file: !3, line: 21, type: !59, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !61)
// CHECK:STDOUT: !58 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.925563b151bf93f6", scope: null, file: !3, line: 21, type: !59, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !61)
// CHECK:STDOUT: !59 = !DISubroutineType(types: !60)
// CHECK:STDOUT: !60 = !{!7, !7, !42}
// CHECK:STDOUT: !61 = !{!62, !63}
@@ -255,7 +255,7 @@ fn M() {
// CHECK:STDOUT: !67 = !DILocation(line: 25, column: 15, scope: !58)
// CHECK:STDOUT: !68 = !DILocation(line: 25, column: 10, scope: !58)
// CHECK:STDOUT: !69 = !DILocation(line: 25, column: 3, scope: !58)
// CHECK:STDOUT: !70 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.c6a12952cc402d96", scope: null, file: !3, line: 21, type: !59, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !71)
// CHECK:STDOUT: !70 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.a87c59609561b819", scope: null, file: !3, line: 21, type: !59, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !71)
// CHECK:STDOUT: !71 = !{!72, !73}
// CHECK:STDOUT: !72 = !DILocalVariable(arg: 1, scope: !70, type: !7)
// CHECK:STDOUT: !73 = !DILocalVariable(arg: 2, scope: !70, type: !42)
@@ -265,7 +265,7 @@ fn M() {
// CHECK:STDOUT: !77 = !DILocation(line: 25, column: 15, scope: !70)
// CHECK:STDOUT: !78 = !DILocation(line: 25, column: 10, scope: !70)
// CHECK:STDOUT: !79 = !DILocation(line: 25, column: 3, scope: !70)
// CHECK:STDOUT: !80 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.cbacb6af70d3d312", scope: null, file: !3, line: 21, type: !59, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !81)
// CHECK:STDOUT: !80 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.23ea5646f3728a97", scope: null, file: !3, line: 21, type: !59, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !81)
// CHECK:STDOUT: !81 = !{!82, !83}
// CHECK:STDOUT: !82 = !DILocalVariable(arg: 1, scope: !80, type: !7)
// CHECK:STDOUT: !83 = !DILocalVariable(arg: 2, scope: !80, type: !42)