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

Complete all pointer types. (#6340)

Browse Source 
Completing a pointer type is trivial, but we still need to do it, and
fail to do so in a few places, which can lead to crashes during
lowering. Switch to completing pointer types when the type is created to
avoid the issue.
This commit is contained in:
Richard Smith
2025-11-08 00:45:12 +00:00
committed by GitHub
parent 13a16270dc
commit dfd9946dc2
6 changed files with 77 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/basics/raw_sem_ir/cpp_interop.carbon
Vendored
+4 -4
View File
@@ -91,14 +91,14 @@ fn G(x: Cpp.X) {
// CHECK:STDOUT: value_repr: {kind: none, type: type(inst60000012)}
// CHECK:STDOUT: 'type(inst6000001D)':
// CHECK:STDOUT: value_repr: {kind: none, type: type(inst60000012)}
// CHECK:STDOUT: 'type(inst(WitnessType))':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst(WitnessType))}
// CHECK:STDOUT: 'type(inst6000001F)':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst6000001F)}
// CHECK:STDOUT: 'type(inst60000023)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(inst60000026)}
// CHECK:STDOUT: 'type(inst(WitnessType))':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst(WitnessType))}
// CHECK:STDOUT: 'type(inst60000026)':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst60000026)}
// CHECK:STDOUT: 'type(inst60000023)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(inst60000026)}
// CHECK:STDOUT: 'type(inst60000014)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(inst60000026)}
// CHECK:STDOUT: 'type(inst60000028)':
toolchain/check/testdata/basics/raw_sem_ir/one_file.carbon
Vendored
+4 -4
View File
@@ -351,18 +351,18 @@ fn Foo[T:! type](p: T*) -> (T*, ()) {
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst(NamespaceType))}
// CHECK:STDOUT: 'type(inst60000024)':
// CHECK:STDOUT: value_repr: {kind: none, type: type(inst60000024)}
// CHECK:STDOUT: 'type(inst60000026)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(inst60000028)}
// CHECK:STDOUT: 'type(inst60000028)':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst60000028)}
// CHECK:STDOUT: 'type(inst60000026)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(inst60000028)}
// CHECK:STDOUT: 'type(inst60000036)':
// CHECK:STDOUT: value_repr: {kind: none, type: type(inst60000024)}
// CHECK:STDOUT: 'type(symbolic_constant3)':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(symbolic_constant3)}
// CHECK:STDOUT: 'type(symbolic_constant7)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(symbolic_constantB)}
// CHECK:STDOUT: 'type(symbolic_constantB)':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(symbolic_constantB)}
// CHECK:STDOUT: 'type(symbolic_constant7)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(symbolic_constantB)}
// CHECK:STDOUT: 'type(inst(WitnessType))':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst(WitnessType))}
// CHECK:STDOUT: 'type(symbolic_constant4)':
toolchain/check/testdata/basics/raw_sem_ir/one_file_with_textual_ir.carbon
Vendored
+2 -2
View File
@@ -46,10 +46,10 @@ fn Foo(n: ()) -> ((), ()) {
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst(NamespaceType))}
// CHECK:STDOUT: 'type(inst6000000F)':
// CHECK:STDOUT: value_repr: {kind: none, type: type(inst6000000F)}
// CHECK:STDOUT: 'type(inst60000018)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(inst6000001A)}
// CHECK:STDOUT: 'type(inst6000001A)':
// CHECK:STDOUT: value_repr: {kind: copy, type: type(inst6000001A)}
// CHECK:STDOUT: 'type(inst60000018)':
// CHECK:STDOUT: value_repr: {kind: pointer, type: type(inst6000001A)}
// CHECK:STDOUT: 'type(inst60000026)':
// CHECK:STDOUT: value_repr: {kind: none, type: type(inst6000000F)}
// CHECK:STDOUT: insts:
toolchain/check/type.cpp
+1 -1
View File
@@ -236,7 +236,7 @@ auto GetFacetType(Context& context, const SemIR::FacetTypeInfo& info)
auto GetPointerType(Context& context, SemIR::TypeInstId pointee_type_id)
-> SemIR::TypeId {
return GetTypeImpl<SemIR::PointerType>(context, pointee_type_id);
return GetCompleteTypeImpl<SemIR::PointerType>(context, pointee_type_id);
}
auto GetPatternType(Context& context, SemIR::TypeId scrutinee_type_id)
toolchain/check/type.h
+2 -1
View File
@@ -100,7 +100,8 @@ auto GetNamedConstraintType(Context& context,
auto GetFacetType(Context& context, const SemIR::FacetTypeInfo& info)
-> SemIR::TypeId;
// Returns a pointer type whose pointee type is `pointee_type_id`.
// Returns a pointer type whose pointee type is `pointee_type_id`. The returned
// type will be complete.
auto GetPointerType(Context& context, SemIR::TypeInstId pointee_type_id)
-> SemIR::TypeId;
toolchain/lower/testdata/interop/cpp/return.carbon
Vendored
+64
View File
@@ -98,6 +98,20 @@ fn Var() {
var x: Cpp.X = Cpp.Make();
}
// --- indirect_return_with_args.carbon
library "[[@TEST_NAME]]";
import Cpp inline '''
class C {};
class D {};
C f(D);
''';
fn Call(x: Cpp.D) -> Cpp.C {
return Cpp.f(x);
}
// CHECK:STDOUT: ; ModuleID = 'import_ints.carbon'
// CHECK:STDOUT: source_filename = "import_ints.carbon"
// CHECK:STDOUT: target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
@@ -481,3 +495,53 @@ fn Var() {
// CHECK:STDOUT: !16 = !DILocation(line: 13, column: 3, scope: !15)
// CHECK:STDOUT: !17 = !DILocation(line: 13, column: 18, scope: !15)
// CHECK:STDOUT: !18 = !DILocation(line: 12, column: 1, scope: !15)
// CHECK:STDOUT: ; ModuleID = 'indirect_return_with_args.carbon'
// CHECK:STDOUT: source_filename = "indirect_return_with_args.carbon"
// CHECK:STDOUT: target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
// CHECK:STDOUT: target triple = "x86_64-unknown-linux-gnu"
// CHECK:STDOUT:
// CHECK:STDOUT: %class.D = type { i8 }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: nounwind
// CHECK:STDOUT: define void @_CCall.Main(ptr sret({}) %return, ptr %x) #0 !dbg !7 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: call void @_Z1f1D.carbon_thunk(ptr %x, ptr %return), !dbg !10
// CHECK:STDOUT: ret void, !dbg !11
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: ; Function Attrs: alwaysinline mustprogress
// CHECK:STDOUT: define dso_local void @_Z1f1D.carbon_thunk(ptr %0, ptr %return) #1 {
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %.addr = alloca ptr, align 8
// CHECK:STDOUT: %return.addr = alloca ptr, align 8
// CHECK:STDOUT: %agg.tmp = alloca %class.D, align 1
// CHECK:STDOUT: %undef.agg.tmp = alloca %class.D, align 1
// CHECK:STDOUT: store ptr %0, ptr %.addr, align 8
// CHECK:STDOUT: store ptr %return, ptr %return.addr, align 8
// CHECK:STDOUT: %1 = load ptr, ptr %return.addr, align 8
// CHECK:STDOUT: %2 = load ptr, ptr %.addr, align 8
// CHECK:STDOUT: call void @_Z1f1D()
// CHECK:STDOUT: ret void
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: declare void @_Z1f1D() #2
// CHECK:STDOUT:
// CHECK:STDOUT: attributes #0 = { nounwind }
// CHECK:STDOUT: attributes #1 = { alwaysinline mustprogress "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="0" "target-cpu"="x86-64" "target-features"="+cmov,+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
// CHECK:STDOUT: attributes #2 = { "no-trapping-math"="true" "stack-protector-buffer-size"="0" "target-cpu"="x86-64" "target-features"="+cmov,+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
// CHECK:STDOUT:
// CHECK:STDOUT: !llvm.module.flags = !{!0, !1, !2, !3, !4}
// CHECK:STDOUT: !llvm.dbg.cu = !{!5}
// CHECK:STDOUT:
// CHECK:STDOUT: !0 = !{i32 7, !"Dwarf Version", i32 5}
// CHECK:STDOUT: !1 = !{i32 2, !"Debug Info Version", i32 3}
// CHECK:STDOUT: !2 = !{i32 1, !"wchar_size", i32 4}
// CHECK:STDOUT: !3 = !{i32 8, !"PIC Level", i32 0}
// CHECK:STDOUT: !4 = !{i32 7, !"PIE Level", i32 2}
// CHECK:STDOUT: !5 = distinct !DICompileUnit(language: DW_LANG_C, file: !6, producer: "carbon", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug)
// CHECK:STDOUT: !6 = !DIFile(filename: "indirect_return_with_args.carbon", directory: "")
// CHECK:STDOUT: !7 = distinct !DISubprogram(name: "Call", linkageName: "_CCall.Main", scope: null, file: !6, line: 10, type: !8, spFlags: DISPFlagDefinition, unit: !5)
// CHECK:STDOUT: !8 = !DISubroutineType(types: !9)
// CHECK:STDOUT: !9 = !{}
// CHECK:STDOUT: !10 = !DILocation(line: 11, column: 10, scope: !7)
// CHECK:STDOUT: !11 = !DILocation(line: 11, column: 3, scope: !7)