mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Compute a correct SpecificFunction when resolving an indirect call to an impl function (#5116)
When performing a call through an impl witness, the callee that we type-check against is the function in the interface, so we form a specific for that callee. However, once the impl witness access resolves, the eventual callee is a different function -- the function in the impl -- so this would cause us to form a `SpecificFunction` where the callee is one function but the specific refers to a different function. Address this by adding another instruction, `SpecificImplFunction`, that takes a function in an impl and a specific for the corresponding function in the interface, and computes and returns a `SpecificFunction` referring to the corresponding specific function in the impl, or returns a direct reference to the function in the `impl` if it's not a generic function.
This commit is contained in:
@@ -18,7 +18,6 @@ class SomeParam {}
|
||||
|
||||
class ImplsSomeInterface {}
|
||||
impl ImplsSomeInterface as SomeInterface(i32) {
|
||||
// TODO: There are two identical definitions generated for this, one is unused
|
||||
fn F(x: i32) -> i32 {
|
||||
return x + x;
|
||||
}
|
||||
@@ -62,8 +61,8 @@ fn G() {
|
||||
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(i64 4, ptr %out.var), !dbg !10
|
||||
// CHECK:STDOUT: %CallGenericMethod.call = call i32 @_CCallGenericMethod.Main.2b28d1a7fa793cbc(i32 10), !dbg !11
|
||||
// CHECK:STDOUT: store i32 %CallGenericMethod.call, ptr %out.var, align 4, !dbg !10
|
||||
// CHECK:STDOUT: %.loc41 = load i32, ptr %out.var, align 4, !dbg !12
|
||||
// CHECK:STDOUT: %print.int = call i32 (ptr, ...) @printf(ptr @printf.int.format, i32 %.loc41), !dbg !13
|
||||
// CHECK:STDOUT: %.loc40 = load i32, ptr %out.var, align 4, !dbg !12
|
||||
// CHECK:STDOUT: %print.int = call i32 (ptr, ...) @printf(ptr @printf.int.format, i32 %.loc40), !dbg !13
|
||||
// CHECK:STDOUT: ret void, !dbg !14
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
@@ -72,18 +71,12 @@ fn G() {
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: define i32 @_CCallGenericMethod.Main.2b28d1a7fa793cbc(i32 %x) !dbg !15 {
|
||||
// CHECK:STDOUT: entry:
|
||||
// CHECK:STDOUT: %F.call = call i32 @"_CF.ImplsSomeInterface.Main:SomeInterface.Main.2b28d1a7fa793cbc"(i32 %x), !dbg !16
|
||||
// CHECK:STDOUT: ret i32 %F.call, !dbg !17
|
||||
// CHECK:STDOUT: %.loc35_15 = call i32 @"_CF.ImplsSomeInterface.Main:SomeInterface.Main"(i32 %x), !dbg !16
|
||||
// CHECK:STDOUT: ret i32 %.loc35_15, !dbg !17
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: declare i32 @printf(ptr, ...)
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: define i32 @"_CF.ImplsSomeInterface.Main:SomeInterface.Main.2b28d1a7fa793cbc"(i32 %x) !dbg !18 {
|
||||
// CHECK:STDOUT: entry:
|
||||
// CHECK:STDOUT: %int.sadd = add i32 %x, %x, !dbg !19
|
||||
// CHECK:STDOUT: ret i32 %int.sadd, !dbg !20
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: attributes #0 = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: !llvm.module.flags = !{!0, !1}
|
||||
@@ -93,20 +86,17 @@ fn G() {
|
||||
// CHECK:STDOUT: !1 = !{i32 2, !"Debug Info Version", i32 3}
|
||||
// CHECK:STDOUT: !2 = distinct !DICompileUnit(language: DW_LANG_C, file: !3, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
|
||||
// CHECK:STDOUT: !3 = !DIFile(filename: "call_impl_function.carbon", directory: "")
|
||||
// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "F", linkageName: "_CF.ImplsSomeInterface.Main:SomeInterface.Main", scope: null, file: !3, line: 22, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "F", linkageName: "_CF.ImplsSomeInterface.Main:SomeInterface.Main", scope: null, file: !3, line: 21, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !5 = !DISubroutineType(types: !6)
|
||||
// CHECK:STDOUT: !6 = !{}
|
||||
// CHECK:STDOUT: !7 = !DILocation(line: 23, column: 12, scope: !4)
|
||||
// CHECK:STDOUT: !8 = !DILocation(line: 23, column: 5, scope: !4)
|
||||
// CHECK:STDOUT: !9 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main", scope: null, file: !3, line: 39, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !10 = !DILocation(line: 40, column: 3, scope: !9)
|
||||
// CHECK:STDOUT: !11 = !DILocation(line: 40, column: 19, scope: !9)
|
||||
// CHECK:STDOUT: !12 = !DILocation(line: 41, column: 14, scope: !9)
|
||||
// CHECK:STDOUT: !13 = !DILocation(line: 41, column: 3, scope: !9)
|
||||
// CHECK:STDOUT: !14 = !DILocation(line: 39, column: 1, scope: !9)
|
||||
// CHECK:STDOUT: !15 = distinct !DISubprogram(name: "CallGenericMethod", linkageName: "_CCallGenericMethod.Main.2b28d1a7fa793cbc", scope: null, file: !3, line: 35, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !16 = !DILocation(line: 36, column: 10, scope: !15)
|
||||
// CHECK:STDOUT: !17 = !DILocation(line: 36, column: 3, scope: !15)
|
||||
// CHECK:STDOUT: !18 = distinct !DISubprogram(name: "F", linkageName: "_CF.ImplsSomeInterface.Main:SomeInterface.Main.2b28d1a7fa793cbc", scope: null, file: !3, line: 22, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !19 = !DILocation(line: 23, column: 12, scope: !18)
|
||||
// CHECK:STDOUT: !20 = !DILocation(line: 23, column: 5, scope: !18)
|
||||
// CHECK:STDOUT: !7 = !DILocation(line: 22, column: 12, scope: !4)
|
||||
// CHECK:STDOUT: !8 = !DILocation(line: 22, column: 5, scope: !4)
|
||||
// CHECK:STDOUT: !9 = distinct !DISubprogram(name: "G", linkageName: "_CG.Main", scope: null, file: !3, line: 38, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !10 = !DILocation(line: 39, column: 3, scope: !9)
|
||||
// CHECK:STDOUT: !11 = !DILocation(line: 39, column: 19, scope: !9)
|
||||
// CHECK:STDOUT: !12 = !DILocation(line: 40, column: 14, scope: !9)
|
||||
// CHECK:STDOUT: !13 = !DILocation(line: 40, column: 3, scope: !9)
|
||||
// CHECK:STDOUT: !14 = !DILocation(line: 38, column: 1, scope: !9)
|
||||
// CHECK:STDOUT: !15 = distinct !DISubprogram(name: "CallGenericMethod", linkageName: "_CCallGenericMethod.Main.2b28d1a7fa793cbc", scope: null, file: !3, line: 34, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !16 = !DILocation(line: 35, column: 10, scope: !15)
|
||||
// CHECK:STDOUT: !17 = !DILocation(line: 35, column: 3, scope: !15)
|
||||
|
||||
Reference in New Issue
Block a user