From e68d65d4f65b449fe826e8bf4381cbc8990b36d5 Mon Sep 17 00:00:00 2001 From: Alina Sbirlea Date: Fri, 16 May 2025 15:25:50 -0700 Subject: [PATCH] Get type in specific when lowering certain instructions. (#5493) Fix handling of instructions where the type lookup has to be based on the specific. --- toolchain/lower/handle_expr_category.cpp | 16 +- .../function/generic/call_deref_ptr.carbon | 150 ++++++++++++++++++ 2 files changed, 159 insertions(+), 7 deletions(-) create mode 100644 toolchain/lower/testdata/function/generic/call_deref_ptr.carbon diff --git a/toolchain/lower/handle_expr_category.cpp b/toolchain/lower/handle_expr_category.cpp index a57775481d34..9847661f7bb6 100644 --- a/toolchain/lower/handle_expr_category.cpp +++ b/toolchain/lower/handle_expr_category.cpp @@ -22,11 +22,12 @@ auto HandleInst(FunctionContext& context, SemIR::InstId inst_id, context.SetLocal(inst_id, llvm::PoisonValue::get(context.GetType(inst.type_id))); break; - case SemIR::ValueRepr::Copy: + case SemIR::ValueRepr::Copy: { + auto* type = context.GetType(SemIR::GetTypeOfInstInSpecific( + context.sem_ir(), context.specific_id(), inst_id)); context.SetLocal(inst_id, context.builder().CreateLoad( - context.GetType(inst.type_id), - context.GetValue(inst.value_id))); - break; + type, context.GetValue(inst.value_id))); + } break; case SemIR::ValueRepr::Pointer: context.SetLocal(inst_id, context.GetValue(inst.value_id)); break; @@ -42,10 +43,11 @@ auto HandleInst(FunctionContext& context, SemIR::InstId inst_id, } auto HandleInst(FunctionContext& context, SemIR::InstId inst_id, - SemIR::TemporaryStorage inst) -> void { + SemIR::TemporaryStorage /*inst*/) -> void { + auto* type = context.GetType(SemIR::GetTypeOfInstInSpecific( + context.sem_ir(), context.specific_id(), inst_id)); context.SetLocal(inst_id, - context.builder().CreateAlloca(context.GetType(inst.type_id), - nullptr, "temp")); + context.builder().CreateAlloca(type, nullptr, "temp")); } auto HandleInst(FunctionContext& context, SemIR::InstId inst_id, diff --git a/toolchain/lower/testdata/function/generic/call_deref_ptr.carbon b/toolchain/lower/testdata/function/generic/call_deref_ptr.carbon new file mode 100644 index 000000000000..74300cef8647 --- /dev/null +++ b/toolchain/lower/testdata/function/generic/call_deref_ptr.carbon @@ -0,0 +1,150 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE +// TIP: To test this file alone, run: +// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/lower/testdata/function/generic/call_deref_ptr.carbon +// TIP: To dump output, run: +// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/lower/testdata/function/generic/call_deref_ptr.carbon + +// Builds on call_basic.carbon and call_impl_function.carbon. +// Test that when equivalence is found for the specific fingerprint, we don't +// conclude "equivalent" for all the call graph. This is to account for +// switching to a work-queue from recursion. + +fn A[U:! type](x: U) -> U { + return x; +} + +fn D[U:! type](x: U) -> U { + return x; +} + +fn B[U:! type](x: U*) { + D(*x); +} + +fn F[T:! type](x: T*) { + A(i32); + B(x); +} + +fn M() { + var ptr_i32 : i32*; + var ptr_f64 : f64*; + + F(ptr_i32); + F(ptr_f64); +} + + +// CHECK:STDOUT: ; ModuleID = 'call_deref_ptr.carbon' +// CHECK:STDOUT: source_filename = "call_deref_ptr.carbon" +// CHECK:STDOUT: +// CHECK:STDOUT: %type = type {} +// CHECK:STDOUT: +// CHECK:STDOUT: define void @_CM.Main() !dbg !4 { +// CHECK:STDOUT: entry: +// CHECK:STDOUT: %ptr_i32.var = alloca ptr, align 8, !dbg !7 +// CHECK:STDOUT: %ptr_f64.var = alloca ptr, 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 !8 +// CHECK:STDOUT: %.loc37 = load ptr, ptr %ptr_i32.var, align 8, !dbg !9 +// CHECK:STDOUT: call void @_CF.Main.b88d1103f417c6d4(ptr %.loc37), !dbg !10 +// CHECK:STDOUT: %.loc38 = load ptr, ptr %ptr_f64.var, align 8, !dbg !11 +// CHECK:STDOUT: call void @_CF.Main.66be507887ceee78(ptr %.loc38), !dbg !12 +// CHECK:STDOUT: ret void, !dbg !13 +// 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 void @_CF.Main.b88d1103f417c6d4(ptr %x) !dbg !14 { +// CHECK:STDOUT: entry: +// CHECK:STDOUT: %A.call = call %type @_CA.Main.5754c7a55c7cbe4a(%type zeroinitializer), !dbg !15 +// CHECK:STDOUT: call void @_CB.Main.b88d1103f417c6d4(ptr %x), !dbg !16 +// CHECK:STDOUT: ret void, !dbg !17 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: define void @_CF.Main.66be507887ceee78(ptr %x) !dbg !18 { +// CHECK:STDOUT: entry: +// CHECK:STDOUT: %A.call = call %type @_CA.Main.5754c7a55c7cbe4a(%type zeroinitializer), !dbg !19 +// CHECK:STDOUT: call void @_CB.Main.66be507887ceee78(ptr %x), !dbg !20 +// CHECK:STDOUT: ret void, !dbg !21 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: define %type @_CA.Main.5754c7a55c7cbe4a(%type %x) !dbg !22 { +// CHECK:STDOUT: entry: +// CHECK:STDOUT: ret %type %x, !dbg !23 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: define void @_CB.Main.b88d1103f417c6d4(ptr %x) !dbg !24 { +// CHECK:STDOUT: entry: +// CHECK:STDOUT: %.loc25_5.2 = load i32, ptr %x, align 4, !dbg !25 +// CHECK:STDOUT: %D.call = call i32 @_CD.Main.b88d1103f417c6d4(i32 %.loc25_5.2), !dbg !26 +// CHECK:STDOUT: ret void, !dbg !27 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: define void @_CB.Main.66be507887ceee78(ptr %x) !dbg !28 { +// CHECK:STDOUT: entry: +// CHECK:STDOUT: %.loc25_5.2 = load double, ptr %x, align 8, !dbg !29 +// CHECK:STDOUT: %D.call = call double @_CD.Main.66be507887ceee78(double %.loc25_5.2), !dbg !30 +// CHECK:STDOUT: ret void, !dbg !31 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: define i32 @_CD.Main.b88d1103f417c6d4(i32 %x) !dbg !32 { +// CHECK:STDOUT: entry: +// CHECK:STDOUT: ret i32 %x, !dbg !33 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: define double @_CD.Main.66be507887ceee78(double %x) !dbg !34 { +// CHECK:STDOUT: entry: +// CHECK:STDOUT: ret double %x, !dbg !35 +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: ; uselistorder directives +// CHECK:STDOUT: uselistorder ptr @llvm.lifetime.start.p0, { 1, 0 } +// CHECK:STDOUT: uselistorder ptr @_CA.Main.5754c7a55c7cbe4a, { 1, 0 } +// CHECK:STDOUT: +// CHECK:STDOUT: attributes #0 = { nocallback nofree nosync nounwind willreturn memory(argmem: readwrite) } +// CHECK:STDOUT: +// CHECK:STDOUT: !llvm.module.flags = !{!0, !1} +// CHECK:STDOUT: !llvm.dbg.cu = !{!2} +// CHECK:STDOUT: +// CHECK:STDOUT: !0 = !{i32 7, !"Dwarf Version", i32 5} +// 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_deref_ptr.carbon", directory: "") +// CHECK:STDOUT: !4 = distinct !DISubprogram(name: "M", linkageName: "_CM.Main", scope: null, file: !3, line: 33, type: !5, spFlags: DISPFlagDefinition, unit: !2) +// CHECK:STDOUT: !5 = !DISubroutineType(types: !6) +// CHECK:STDOUT: !6 = !{} +// CHECK:STDOUT: !7 = !DILocation(line: 34, column: 3, scope: !4) +// CHECK:STDOUT: !8 = !DILocation(line: 35, column: 3, scope: !4) +// CHECK:STDOUT: !9 = !DILocation(line: 37, column: 5, scope: !4) +// CHECK:STDOUT: !10 = !DILocation(line: 37, column: 3, scope: !4) +// CHECK:STDOUT: !11 = !DILocation(line: 38, column: 5, scope: !4) +// CHECK:STDOUT: !12 = !DILocation(line: 38, column: 3, scope: !4) +// CHECK:STDOUT: !13 = !DILocation(line: 33, column: 1, scope: !4) +// CHECK:STDOUT: !14 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.b88d1103f417c6d4", scope: null, file: !3, line: 28, type: !5, spFlags: DISPFlagDefinition, unit: !2) +// CHECK:STDOUT: !15 = !DILocation(line: 29, column: 3, scope: !14) +// CHECK:STDOUT: !16 = !DILocation(line: 30, column: 3, scope: !14) +// CHECK:STDOUT: !17 = !DILocation(line: 28, column: 1, scope: !14) +// CHECK:STDOUT: !18 = distinct !DISubprogram(name: "F", linkageName: "_CF.Main.66be507887ceee78", scope: null, file: !3, line: 28, type: !5, spFlags: DISPFlagDefinition, unit: !2) +// CHECK:STDOUT: !19 = !DILocation(line: 29, column: 3, scope: !18) +// CHECK:STDOUT: !20 = !DILocation(line: 30, column: 3, scope: !18) +// CHECK:STDOUT: !21 = !DILocation(line: 28, column: 1, scope: !18) +// CHECK:STDOUT: !22 = distinct !DISubprogram(name: "A", linkageName: "_CA.Main.5754c7a55c7cbe4a", scope: null, file: !3, line: 16, type: !5, spFlags: DISPFlagDefinition, unit: !2) +// CHECK:STDOUT: !23 = !DILocation(line: 17, column: 3, scope: !22) +// CHECK:STDOUT: !24 = distinct !DISubprogram(name: "B", linkageName: "_CB.Main.b88d1103f417c6d4", scope: null, file: !3, line: 24, type: !5, spFlags: DISPFlagDefinition, unit: !2) +// CHECK:STDOUT: !25 = !DILocation(line: 25, column: 5, scope: !24) +// CHECK:STDOUT: !26 = !DILocation(line: 25, column: 3, scope: !24) +// CHECK:STDOUT: !27 = !DILocation(line: 24, column: 1, scope: !24) +// CHECK:STDOUT: !28 = distinct !DISubprogram(name: "B", linkageName: "_CB.Main.66be507887ceee78", scope: null, file: !3, line: 24, type: !5, spFlags: DISPFlagDefinition, unit: !2) +// CHECK:STDOUT: !29 = !DILocation(line: 25, column: 5, scope: !28) +// CHECK:STDOUT: !30 = !DILocation(line: 25, column: 3, scope: !28) +// CHECK:STDOUT: !31 = !DILocation(line: 24, column: 1, scope: !28) +// CHECK:STDOUT: !32 = distinct !DISubprogram(name: "D", linkageName: "_CD.Main.b88d1103f417c6d4", scope: null, file: !3, line: 20, type: !5, spFlags: DISPFlagDefinition, unit: !2) +// CHECK:STDOUT: !33 = !DILocation(line: 21, column: 3, scope: !32) +// CHECK:STDOUT: !34 = distinct !DISubprogram(name: "D", linkageName: "_CD.Main.66be507887ceee78", scope: null, file: !3, line: 20, type: !5, spFlags: DISPFlagDefinition, unit: !2) +// CHECK:STDOUT: !35 = !DILocation(line: 21, column: 3, scope: !34)