mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Add Copy interface and use it for making copies. (#6034)
Instead of hardcoding which types are copyable, add a `Core.Copy` interface to perform copying. Move almost all the current copy support to that interface. Some remaining pieces are still using builtin logic after this PR: * For tuples and structs, builtin logic is used to perform elementwise copies. This also supports copying *adapters of* tuples and structs, which seems like it may not be desirable, especially for non-extending adapters. A `Copy` impl is provided for tuples of at most 2 elements, so that `Core.Copy` constraints are satisfied, but we can't implement this generally until we have variadics support, and don't yet have a mechanism to generalize this to structs. * For `enum` types imported from C++, builtin logic is used to perform a copy. This is temporary until we have a mechanism to identify these types from an impl in the prelude. One lowering test in `toolchain/lower/testdata/class/generic.carbon` is disabled for now, as it causes a crash in the lowering code due to an ABI mismatch between the call signature in the lowered declaration of a specific function and the call that is generated in the specific callee. Fixing this is a little involved, and will be done in a separate PR. --------- Co-authored-by: Geoff Romer <gromer@google.com>
This commit is contained in:
co-authored by
Geoff Romer
parent
91722ae21a
commit
1ec8ac7ef9
+43
-43
@@ -30,7 +30,7 @@ fn F() {
|
||||
// CHECK:STDOUT: entry:
|
||||
// CHECK:STDOUT: %.loc16_43.3.temp = alloca [6 x i32], align 4, !dbg !7
|
||||
// CHECK:STDOUT: %var = alloca i32, align 4, !dbg !8
|
||||
// CHECK:STDOUT: %.loc17_19.1.temp = alloca { i1, i32 }, align 8, !dbg !8
|
||||
// CHECK:STDOUT: %.loc17_19.3.temp = alloca { i1, i32 }, align 8, !dbg !8
|
||||
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %.loc16_43.3.temp), !dbg !7
|
||||
// CHECK:STDOUT: %.loc16_43.4.array.index = getelementptr inbounds [6 x i32], ptr %.loc16_43.3.temp, i32 0, i64 0, !dbg !7
|
||||
// CHECK:STDOUT: %.loc16_43.7.array.index = getelementptr inbounds [6 x i32], ptr %.loc16_43.3.temp, i32 0, i64 1, !dbg !7
|
||||
@@ -39,19 +39,19 @@ fn F() {
|
||||
// CHECK:STDOUT: %.loc16_43.16.array.index = getelementptr inbounds [6 x i32], ptr %.loc16_43.3.temp, i32 0, i64 4, !dbg !7
|
||||
// CHECK:STDOUT: %.loc16_43.19.array.index = getelementptr inbounds [6 x i32], ptr %.loc16_43.3.temp, i32 0, i64 5, !dbg !7
|
||||
// CHECK:STDOUT: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %.loc16_43.3.temp, ptr align 4 @array.loc16_43.22, i64 24, i1 false), !dbg !7
|
||||
// CHECK:STDOUT: %array_type.as.Iterate.impl.NewCursor.call = call i32 @"_CNewCursor.bb5cc7788b91e55e:Iterate.Core.b2c3e6e8ff6963ef"(ptr %.loc16_43.3.temp), !dbg !8
|
||||
// CHECK:STDOUT: %array_type.as.Iterate.impl.NewCursor.call = call i32 @"_CNewCursor.9af210df0a072efb:Iterate.Core.5ffcaa626964d948"(ptr %.loc16_43.3.temp), !dbg !8
|
||||
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %var), !dbg !8
|
||||
// CHECK:STDOUT: store i32 %array_type.as.Iterate.impl.NewCursor.call, ptr %var, align 4, !dbg !8
|
||||
// CHECK:STDOUT: br label %for.next, !dbg !8
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: for.next: ; preds = %for.body, %entry
|
||||
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %.loc17_19.1.temp), !dbg !8
|
||||
// CHECK:STDOUT: call void @"_CNext.bb5cc7788b91e55e:Iterate.Core.b2c3e6e8ff6963ef"(ptr %.loc17_19.1.temp, ptr %.loc16_43.3.temp, ptr %var), !dbg !8
|
||||
// CHECK:STDOUT: %Optional.HasValue.call = call i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %.loc17_19.1.temp), !dbg !8
|
||||
// CHECK:STDOUT: call void @llvm.lifetime.start.p0(ptr %.loc17_19.3.temp), !dbg !8
|
||||
// CHECK:STDOUT: call void @"_CNext.9af210df0a072efb:Iterate.Core.5ffcaa626964d948"(ptr %.loc17_19.3.temp, ptr %.loc16_43.3.temp, ptr %var), !dbg !8
|
||||
// CHECK:STDOUT: %Optional.HasValue.call = call i1 @_CHasValue.Optional.Core.b7c8e4dff2adcdaa(ptr %.loc17_19.3.temp), !dbg !8
|
||||
// CHECK:STDOUT: br i1 %Optional.HasValue.call, label %for.body, label %for.done, !dbg !8
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: for.body: ; preds = %for.next
|
||||
// CHECK:STDOUT: %Optional.Get.call = call i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %.loc17_19.1.temp), !dbg !8
|
||||
// CHECK:STDOUT: %Optional.Get.call = call i32 @_CGet.Optional.Core.b7c8e4dff2adcdaa(ptr %.loc17_19.3.temp), !dbg !8
|
||||
// CHECK:STDOUT: call void @_CG.Main(i32 %Optional.Get.call), !dbg !9
|
||||
// CHECK:STDOUT: br label %for.next, !dbg !10
|
||||
// CHECK:STDOUT:
|
||||
@@ -65,11 +65,11 @@ fn F() {
|
||||
// CHECK:STDOUT: ; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: readwrite)
|
||||
// CHECK:STDOUT: declare void @llvm.memcpy.p0.p0.i64(ptr noalias writeonly captures(none), ptr noalias readonly captures(none), i64, i1 immarg) #1
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: define linkonce_odr i32 @"_CNewCursor.bb5cc7788b91e55e:Iterate.Core.b2c3e6e8ff6963ef"(ptr %self) !dbg !12 {
|
||||
// CHECK:STDOUT: define linkonce_odr i32 @"_CNewCursor.9af210df0a072efb:Iterate.Core.5ffcaa626964d948"(ptr %self) !dbg !12 {
|
||||
// CHECK:STDOUT: ret i32 0, !dbg !14
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: define linkonce_odr void @"_CNext.bb5cc7788b91e55e:Iterate.Core.b2c3e6e8ff6963ef"(ptr sret({ i1, i32 }) %return, ptr %self, ptr %cursor) !dbg !15 {
|
||||
// CHECK:STDOUT: define linkonce_odr void @"_CNext.9af210df0a072efb:Iterate.Core.5ffcaa626964d948"(ptr sret({ i1, i32 }) %return, ptr %self, ptr %cursor) !dbg !15 {
|
||||
// CHECK:STDOUT: %1 = load i32, ptr %cursor, align 4, !dbg !16
|
||||
// CHECK:STDOUT: %2 = icmp slt i32 %1, 6, !dbg !16
|
||||
// CHECK:STDOUT: br i1 %2, label %3, label %7, !dbg !17
|
||||
@@ -80,22 +80,22 @@ fn F() {
|
||||
// CHECK:STDOUT: %5 = sub i32 %4, 1, !dbg !19
|
||||
// CHECK:STDOUT: %array.index = getelementptr inbounds [6 x i32], ptr %self, i32 0, i32 %5, !dbg !20
|
||||
// CHECK:STDOUT: %6 = load i32, ptr %array.index, align 4, !dbg !20
|
||||
// CHECK:STDOUT: call void @_CSome.Optional.Core.b88d1103f417c6d4(ptr %return, i32 %6), !dbg !21
|
||||
// CHECK:STDOUT: call void @_CSome.Optional.Core.b7c8e4dff2adcdaa(ptr %return, i32 %6), !dbg !21
|
||||
// CHECK:STDOUT: ret void, !dbg !22
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: 7: ; preds = %0
|
||||
// CHECK:STDOUT: call void @_CNone.Optional.Core.b88d1103f417c6d4(ptr %return), !dbg !23
|
||||
// CHECK:STDOUT: call void @_CNone.Optional.Core.b7c8e4dff2adcdaa(ptr %return), !dbg !23
|
||||
// CHECK:STDOUT: ret void, !dbg !24
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: define linkonce_odr i1 @_CHasValue.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !25 {
|
||||
// CHECK:STDOUT: define linkonce_odr i1 @_CHasValue.Optional.Core.b7c8e4dff2adcdaa(ptr %self) !dbg !25 {
|
||||
// CHECK:STDOUT: %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 0, !dbg !27
|
||||
// CHECK:STDOUT: %1 = load i8, ptr %has_value, align 1, !dbg !27
|
||||
// CHECK:STDOUT: %2 = trunc i8 %1 to i1, !dbg !27
|
||||
// CHECK:STDOUT: ret i1 %2, !dbg !28
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: define linkonce_odr i32 @_CGet.Optional.Core.b88d1103f417c6d4(ptr %self) !dbg !29 {
|
||||
// CHECK:STDOUT: define linkonce_odr i32 @_CGet.Optional.Core.b7c8e4dff2adcdaa(ptr %self) !dbg !29 {
|
||||
// CHECK:STDOUT: %value = getelementptr inbounds nuw { i1, i32 }, ptr %self, i32 0, i32 1, !dbg !30
|
||||
// CHECK:STDOUT: %1 = load i32, ptr %value, align 4, !dbg !30
|
||||
// CHECK:STDOUT: ret i32 %1, !dbg !31
|
||||
@@ -106,7 +106,7 @@ fn F() {
|
||||
// CHECK:STDOUT: ret void, !dbg !35
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: define linkonce_odr void @_CSome.Optional.Core.b88d1103f417c6d4(ptr sret({ i1, i32 }) %return, i32 %value) !dbg !36 {
|
||||
// CHECK:STDOUT: define linkonce_odr void @_CSome.Optional.Core.b7c8e4dff2adcdaa(ptr sret({ i1, i32 }) %return, i32 %value) !dbg !36 {
|
||||
// CHECK:STDOUT: %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 0, !dbg !37
|
||||
// CHECK:STDOUT: %value1 = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 1, !dbg !37
|
||||
// CHECK:STDOUT: store i32 %value, ptr %value1, align 4, !dbg !37
|
||||
@@ -114,7 +114,7 @@ fn F() {
|
||||
// CHECK:STDOUT: ret void, !dbg !38
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: define linkonce_odr void @_CNone.Optional.Core.b88d1103f417c6d4(ptr sret({ i1, i32 }) %return) !dbg !39 {
|
||||
// CHECK:STDOUT: define linkonce_odr void @_CNone.Optional.Core.b7c8e4dff2adcdaa(ptr sret({ i1, i32 }) %return) !dbg !39 {
|
||||
// CHECK:STDOUT: %has_value = getelementptr inbounds nuw { i1, i32 }, ptr %return, i32 0, i32 0, !dbg !40
|
||||
// CHECK:STDOUT: store i8 0, ptr %has_value, align 1, !dbg !40
|
||||
// CHECK:STDOUT: ret void, !dbg !41
|
||||
@@ -153,39 +153,39 @@ fn F() {
|
||||
// CHECK:STDOUT: !9 = !DILocation(line: 18, column: 5, scope: !4)
|
||||
// CHECK:STDOUT: !10 = !DILocation(line: 17, column: 3, scope: !4)
|
||||
// CHECK:STDOUT: !11 = !DILocation(line: 15, column: 1, scope: !4)
|
||||
// CHECK:STDOUT: !12 = distinct !DISubprogram(name: "NewCursor", linkageName: "_CNewCursor.bb5cc7788b91e55e:Iterate.Core.b2c3e6e8ff6963ef", scope: null, file: !13, line: 21, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !12 = distinct !DISubprogram(name: "NewCursor", linkageName: "_CNewCursor.9af210df0a072efb:Iterate.Core.5ffcaa626964d948", scope: null, file: !13, line: 23, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !13 = !DIFile(filename: "{{.*}}/prelude/iterate.carbon", directory: "")
|
||||
// CHECK:STDOUT: !14 = !DILocation(line: 21, column: 39, scope: !12)
|
||||
// CHECK:STDOUT: !15 = distinct !DISubprogram(name: "Next", linkageName: "_CNext.bb5cc7788b91e55e:Iterate.Core.b2c3e6e8ff6963ef", scope: null, file: !13, line: 22, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !16 = !DILocation(line: 23, column: 9, scope: !15)
|
||||
// CHECK:STDOUT: !17 = !DILocation(line: 23, column: 8, scope: !15)
|
||||
// CHECK:STDOUT: !18 = !DILocation(line: 24, column: 7, scope: !15)
|
||||
// CHECK:STDOUT: !19 = !DILocation(line: 25, column: 36, scope: !15)
|
||||
// CHECK:STDOUT: !20 = !DILocation(line: 25, column: 31, scope: !15)
|
||||
// CHECK:STDOUT: !21 = !DILocation(line: 25, column: 14, scope: !15)
|
||||
// CHECK:STDOUT: !22 = !DILocation(line: 25, column: 7, scope: !15)
|
||||
// CHECK:STDOUT: !23 = !DILocation(line: 27, column: 14, scope: !15)
|
||||
// CHECK:STDOUT: !24 = !DILocation(line: 27, column: 7, scope: !15)
|
||||
// CHECK:STDOUT: !25 = distinct !DISubprogram(name: "HasValue", linkageName: "_CHasValue.Optional.Core.b88d1103f417c6d4", scope: null, file: !26, line: 29, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !14 = !DILocation(line: 23, column: 39, scope: !12)
|
||||
// CHECK:STDOUT: !15 = distinct !DISubprogram(name: "Next", linkageName: "_CNext.9af210df0a072efb:Iterate.Core.5ffcaa626964d948", scope: null, file: !13, line: 24, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !16 = !DILocation(line: 25, column: 9, scope: !15)
|
||||
// CHECK:STDOUT: !17 = !DILocation(line: 25, column: 8, scope: !15)
|
||||
// CHECK:STDOUT: !18 = !DILocation(line: 26, column: 7, scope: !15)
|
||||
// CHECK:STDOUT: !19 = !DILocation(line: 27, column: 36, scope: !15)
|
||||
// CHECK:STDOUT: !20 = !DILocation(line: 27, column: 31, scope: !15)
|
||||
// CHECK:STDOUT: !21 = !DILocation(line: 27, column: 14, scope: !15)
|
||||
// CHECK:STDOUT: !22 = !DILocation(line: 27, column: 7, scope: !15)
|
||||
// CHECK:STDOUT: !23 = !DILocation(line: 29, column: 14, scope: !15)
|
||||
// CHECK:STDOUT: !24 = !DILocation(line: 29, column: 7, scope: !15)
|
||||
// CHECK:STDOUT: !25 = distinct !DISubprogram(name: "HasValue", linkageName: "_CHasValue.Optional.Core.b7c8e4dff2adcdaa", scope: null, file: !26, line: 30, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !26 = !DIFile(filename: "{{.*}}/prelude/types/optional.carbon", directory: "")
|
||||
// CHECK:STDOUT: !27 = !DILocation(line: 29, column: 46, scope: !25)
|
||||
// CHECK:STDOUT: !28 = !DILocation(line: 29, column: 39, scope: !25)
|
||||
// CHECK:STDOUT: !29 = distinct !DISubprogram(name: "Get", linkageName: "_CGet.Optional.Core.b88d1103f417c6d4", scope: null, file: !26, line: 30, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !30 = !DILocation(line: 30, column: 38, scope: !29)
|
||||
// CHECK:STDOUT: !31 = !DILocation(line: 30, column: 31, scope: !29)
|
||||
// CHECK:STDOUT: !32 = distinct !DISubprogram(name: "Op", linkageName: "_COp.Int.Core:Inc.Core.be1e879c1ad406d8", scope: null, file: !33, line: 332, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !27 = !DILocation(line: 30, column: 46, scope: !25)
|
||||
// CHECK:STDOUT: !28 = !DILocation(line: 30, column: 39, scope: !25)
|
||||
// CHECK:STDOUT: !29 = distinct !DISubprogram(name: "Get", linkageName: "_CGet.Optional.Core.b7c8e4dff2adcdaa", scope: null, file: !26, line: 31, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !30 = !DILocation(line: 31, column: 38, scope: !29)
|
||||
// CHECK:STDOUT: !31 = !DILocation(line: 31, column: 31, scope: !29)
|
||||
// CHECK:STDOUT: !32 = distinct !DISubprogram(name: "Op", linkageName: "_COp.Int.Core:Inc.Core.be1e879c1ad406d8", scope: null, file: !33, line: 339, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !33 = !DIFile(filename: "{{.*}}/prelude/types/int.carbon", directory: "")
|
||||
// CHECK:STDOUT: !34 = !DILocation(line: 334, column: 5, scope: !32)
|
||||
// CHECK:STDOUT: !35 = !DILocation(line: 332, column: 3, scope: !32)
|
||||
// CHECK:STDOUT: !36 = distinct !DISubprogram(name: "Some", linkageName: "_CSome.Optional.Core.b88d1103f417c6d4", scope: null, file: !26, line: 25, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !37 = !DILocation(line: 26, column: 12, scope: !36)
|
||||
// CHECK:STDOUT: !38 = !DILocation(line: 26, column: 5, scope: !36)
|
||||
// CHECK:STDOUT: !39 = distinct !DISubprogram(name: "None", linkageName: "_CNone.Optional.Core.b88d1103f417c6d4", scope: null, file: !26, line: 19, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !40 = !DILocation(line: 21, column: 5, scope: !39)
|
||||
// CHECK:STDOUT: !41 = !DILocation(line: 22, column: 5, scope: !39)
|
||||
// CHECK:STDOUT: !42 = distinct !DISubprogram(name: "Op", linkageName: "_COp:thunk.Int.Core:AddAssignWith.Core.f86036ee2cd10fd3", scope: null, file: !33, line: 268, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !34 = !DILocation(line: 341, column: 5, scope: !32)
|
||||
// CHECK:STDOUT: !35 = !DILocation(line: 339, column: 3, scope: !32)
|
||||
// CHECK:STDOUT: !36 = distinct !DISubprogram(name: "Some", linkageName: "_CSome.Optional.Core.b7c8e4dff2adcdaa", scope: null, file: !26, line: 26, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !37 = !DILocation(line: 27, column: 12, scope: !36)
|
||||
// CHECK:STDOUT: !38 = !DILocation(line: 27, column: 5, scope: !36)
|
||||
// CHECK:STDOUT: !39 = distinct !DISubprogram(name: "None", linkageName: "_CNone.Optional.Core.b7c8e4dff2adcdaa", scope: null, file: !26, line: 20, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !40 = !DILocation(line: 22, column: 5, scope: !39)
|
||||
// CHECK:STDOUT: !41 = !DILocation(line: 23, column: 5, scope: !39)
|
||||
// CHECK:STDOUT: !42 = distinct !DISubprogram(name: "Op", linkageName: "_COp:thunk.Int.Core:AddAssignWith.Core.f86036ee2cd10fd3", scope: null, file: !33, line: 275, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !43 = !DILocation(line: 4294967295, scope: !42)
|
||||
// CHECK:STDOUT: !44 = !DILocation(line: 268, column: 3, scope: !42)
|
||||
// CHECK:STDOUT: !44 = !DILocation(line: 275, column: 3, scope: !42)
|
||||
// CHECK:STDOUT: !45 = distinct !DISubprogram(name: "Convert", linkageName: "_CConvert.8b3d5d6a6c17be04:ImplicitAs.Core.1abd39b699024258", scope: null, file: !46, line: 23, type: !5, spFlags: DISPFlagDefinition, unit: !2)
|
||||
// CHECK:STDOUT: !46 = !DIFile(filename: "{{.*}}/prelude/operators/as.carbon", directory: "")
|
||||
// CHECK:STDOUT: !47 = !DILocation(line: 23, column: 38, scope: !45)
|
||||
|
||||
Reference in New Issue
Block a user