Skip to content

Commit e2ab976

Browse files
authored
Fix lowering of specific_functions referring to methods. (#4464)
In this case, the callee may be non-constant because it includes a reference to `self`, so we need to be able to lower a non-constant `specific_function`.
1 parent 99e9660 commit e2ab976

File tree

3 files changed

+68
-1
lines changed

3 files changed

+68
-1
lines changed

toolchain/lower/handle.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@ auto HandleInst(FunctionContext& context, SemIR::InstId /*inst_id*/,
219219
}
220220
}
221221

222+
auto HandleInst(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/,
223+
SemIR::SpecificFunction /*inst*/) -> void {
224+
// Nothing to do. This value should never be consumed.
225+
}
226+
222227
auto HandleInst(FunctionContext& context, SemIR::InstId inst_id,
223228
SemIR::SpliceBlock inst) -> void {
224229
context.LowerBlock(inst.block_id);
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
2+
// Exceptions. See /LICENSE for license information.
3+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
//
5+
// AUTOUPDATE
6+
// TIP: To test this file alone, run:
7+
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/lower/testdata/function/generic/call_method.carbon
8+
// TIP: To dump output, run:
9+
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/lower/testdata/function/generic/call_method.carbon
10+
11+
class C {
12+
fn F[self: Self, T:! type](x: T) -> T {
13+
return x;
14+
}
15+
}
16+
17+
fn CallF() -> i32 {
18+
var c: C = {};
19+
var n: i32 = 0;
20+
return c.F(n);
21+
}
22+
23+
// CHECK:STDOUT: ; ModuleID = 'call_method.carbon'
24+
// CHECK:STDOUT: source_filename = "call_method.carbon"
25+
// CHECK:STDOUT:
26+
// CHECK:STDOUT: @struct.loc18_16 = internal constant {} zeroinitializer
27+
// CHECK:STDOUT:
28+
// CHECK:STDOUT: define i32 @_CCallF.Main() !dbg !4 {
29+
// CHECK:STDOUT: entry:
30+
// CHECK:STDOUT: %c.var = alloca {}, align 8, !dbg !7
31+
// CHECK:STDOUT: call void @llvm.memcpy.p0.p0.i64(ptr align 1 %c.var, ptr align 1 @struct.loc18_16, i64 0, i1 false), !dbg !8
32+
// CHECK:STDOUT: %n.var = alloca i32, align 4, !dbg !9
33+
// CHECK:STDOUT: store i32 0, ptr %n.var, align 4, !dbg !10
34+
// CHECK:STDOUT: %.loc20_14 = load i32, ptr %n.var, align 4, !dbg !11
35+
// CHECK:STDOUT: %F.call = call i32 @_CF.C.Main.1(ptr %c.var, i32 %.loc20_14), !dbg !12
36+
// CHECK:STDOUT: ret i32 %F.call, !dbg !13
37+
// CHECK:STDOUT: }
38+
// CHECK:STDOUT:
39+
// CHECK:STDOUT: ; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: readwrite)
40+
// CHECK:STDOUT: declare void @llvm.memcpy.p0.p0.i64(ptr noalias nocapture writeonly, ptr noalias nocapture readonly, i64, i1 immarg) #0
41+
// CHECK:STDOUT:
42+
// CHECK:STDOUT: declare i32 @_CF.C.Main.1(ptr, i32)
43+
// CHECK:STDOUT:
44+
// CHECK:STDOUT: attributes #0 = { nocallback nofree nounwind willreturn memory(argmem: readwrite) }
45+
// CHECK:STDOUT:
46+
// CHECK:STDOUT: !llvm.module.flags = !{!0, !1}
47+
// CHECK:STDOUT: !llvm.dbg.cu = !{!2}
48+
// CHECK:STDOUT:
49+
// CHECK:STDOUT: !0 = !{i32 7, !"Dwarf Version", i32 5}
50+
// CHECK:STDOUT: !1 = !{i32 2, !"Debug Info Version", i32 3}
51+
// CHECK:STDOUT: !2 = distinct !DICompileUnit(language: DW_LANG_C, file: !3, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
52+
// CHECK:STDOUT: !3 = !DIFile(filename: "call_method.carbon", directory: "")
53+
// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "CallF", linkageName: "_CCallF.Main", scope: null, file: !3, line: 17, type: !5, spFlags: DISPFlagDefinition, unit: !2)
54+
// CHECK:STDOUT: !5 = !DISubroutineType(types: !6)
55+
// CHECK:STDOUT: !6 = !{}
56+
// CHECK:STDOUT: !7 = !DILocation(line: 18, column: 7, scope: !4)
57+
// CHECK:STDOUT: !8 = !DILocation(line: 18, column: 3, scope: !4)
58+
// CHECK:STDOUT: !9 = !DILocation(line: 19, column: 7, scope: !4)
59+
// CHECK:STDOUT: !10 = !DILocation(line: 19, column: 3, scope: !4)
60+
// CHECK:STDOUT: !11 = !DILocation(line: 20, column: 14, scope: !4)
61+
// CHECK:STDOUT: !12 = !DILocation(line: 20, column: 10, scope: !4)
62+
// CHECK:STDOUT: !13 = !DILocation(line: 20, column: 3, scope: !4)

toolchain/sem_ir/typed_insts.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ struct SpecificConstant {
10311031
struct SpecificFunction {
10321032
static constexpr auto Kind = InstKind::SpecificFunction.Define<Parse::NodeId>(
10331033
{.ir_name = "specific_function",
1034-
.constant_kind = InstConstantKind::Always});
1034+
.constant_kind = InstConstantKind::Conditional});
10351035

10361036
// Always the builtin SpecificFunctionType.
10371037
TypeId type_id;

0 commit comments

Comments
 (0)