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

Avoid symbolic witnesses for .Self in an impl decl (#7564)

Browse Source 
Point symbolic witnesses into `.Self` written inside an impl decl at the
impl that is being declared. This is tricky because the impl does not
yet exist. So we use a new instruction `ImplSelfWitness` which _will_ be
replaced by the `ImplWitness` once it becomes available. The
`ImplSelfWitness` acts like a symbolic witness, except it does not
perform lookup, since we know which impl we will get a witness from.

This prevents us from finding other impls when performing lookups into
`.Self` in an impl decl, which produces incorrect/incoherent results.
This commit is contained in:
Dana Jansens
2026-07-29 16:25:23 +00:00
committed by GitHub
parent 2ac425e591
commit f51c075f8b
94 changed files with 3221 additions and 2797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lower/testdata/function/generic/call_different_associated_const.carbon
Vendored
+6 -6
View File
@@ -44,13 +44,13 @@ fn H() {
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define void @_CH.Main() #0 !dbg !4 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: call void @_CG.Main.c7b5696da1f8b34f(), !dbg !7
// CHECK:STDOUT: call void @_CG.Main.726001587f235b1b(), !dbg !8
// CHECK:STDOUT: call void @_CG.Main.20ca60fb00b19f60(), !dbg !7
// CHECK:STDOUT: call void @_CG.Main.af98d350d462566f(), !dbg !8
// CHECK:STDOUT: ret void, !dbg !9
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define linkonce_odr void @_CG.Main.c7b5696da1f8b34f() #0 !dbg !10 {
// CHECK:STDOUT: define linkonce_odr void @_CG.Main.20ca60fb00b19f60() #0 !dbg !10 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %_.var = alloca ptr, align 8, !dbg !11
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %_.var), !dbg !11
@@ -59,7 +59,7 @@ fn H() {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define linkonce_odr void @_CG.Main.726001587f235b1b() #0 !dbg !13 {
// CHECK:STDOUT: define linkonce_odr void @_CG.Main.af98d350d462566f() #0 !dbg !13 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %_.var = alloca ptr, align 8, !dbg !14
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %_.var), !dbg !14
@@ -89,10 +89,10 @@ fn H() {
// CHECK:STDOUT: !7 = !DILocation(line: 36, column: 3, scope: !4)
// CHECK:STDOUT: !8 = !DILocation(line: 37, column: 3, scope: !4)
// CHECK:STDOUT: !9 = !DILocation(line: 35, column: 1, scope: !4)
// CHECK:STDOUT: !10 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main.c7b5696da1f8b34f", scope: null, file: !1, line: 22, type: !5, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !10 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main.20ca60fb00b19f60", scope: null, file: !1, line: 22, type: !5, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !11 = !DILocation(line: 23, column: 3, scope: !10)
// CHECK:STDOUT: !12 = !DILocation(line: 22, column: 1, scope: !10)
// CHECK:STDOUT: !13 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main.726001587f235b1b", scope: null, file: !1, line: 22, type: !5, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !13 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main.af98d350d462566f", scope: null, file: !1, line: 22, type: !5, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !14 = !DILocation(line: 23, column: 3, scope: !13)
// CHECK:STDOUT: !15 = !DILocation(line: 22, column: 1, scope: !13)
// CHECK:STDOUT:
toolchain/lower/testdata/function/generic/call_different_impls_with_const.carbon
Vendored
+6 -6
View File
@@ -72,15 +72,15 @@ fn Run() {
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define i32 @main() #0 !dbg !22 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: call void @_CG.Main.e2c7a58ecf9ad23e(), !dbg !23
// CHECK:STDOUT: call void @_CG.Main.01a101e5421592ac(), !dbg !24
// CHECK:STDOUT: call void @_CG.Main.5e71264ff2c4fee0(), !dbg !23
// CHECK:STDOUT: call void @_CG.Main.c172ec5cde2d1e27(), !dbg !24
// CHECK:STDOUT: ret i32 0, !dbg !25
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: declare i32 @printf(ptr, ...)
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define linkonce_odr void @_CG.Main.e2c7a58ecf9ad23e() #0 !dbg !26 {
// CHECK:STDOUT: define linkonce_odr void @_CG.Main.5e71264ff2c4fee0() #0 !dbg !26 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %.loc38_20.1.temp = alloca i1, align 1, !dbg !29
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %.loc38_20.1.temp), !dbg !29
@@ -93,7 +93,7 @@ fn Run() {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define linkonce_odr void @_CG.Main.01a101e5421592ac() #0 !dbg !31 {
// CHECK:STDOUT: define linkonce_odr void @_CG.Main.c172ec5cde2d1e27() #0 !dbg !31 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %.loc38_20.1.temp = alloca i32, align 4, !dbg !32
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %.loc38_20.1.temp), !dbg !32
@@ -143,12 +143,12 @@ fn Run() {
// CHECK:STDOUT: !23 = !DILocation(line: 42, column: 3, scope: !22)
// CHECK:STDOUT: !24 = !DILocation(line: 43, column: 3, scope: !22)
// CHECK:STDOUT: !25 = !DILocation(line: 41, column: 1, scope: !22)
// CHECK:STDOUT: !26 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main.e2c7a58ecf9ad23e", scope: null, file: !1, line: 37, type: !27, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !26 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main.5e71264ff2c4fee0", scope: null, file: !1, line: 37, type: !27, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !27 = !DISubroutineType(types: !28)
// CHECK:STDOUT: !28 = !{null}
// CHECK:STDOUT: !29 = !DILocation(line: 38, column: 16, scope: !26)
// CHECK:STDOUT: !30 = !DILocation(line: 37, column: 1, scope: !26)
// CHECK:STDOUT: !31 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main.01a101e5421592ac", scope: null, file: !1, line: 37, type: !27, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !31 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main.c172ec5cde2d1e27", scope: null, file: !1, line: 37, type: !27, spFlags: DISPFlagDefinition, unit: !0)
// CHECK:STDOUT: !32 = !DILocation(line: 38, column: 16, scope: !31)
// CHECK:STDOUT: !33 = !DILocation(line: 37, column: 1, scope: !31)
// CHECK:STDOUT: