@@ -415,9 +415,9 @@ namespace {
415
415
}
416
416
};
417
417
418
- class AddressOnlyClangRecordTypeInfo final
419
- : public StructTypeInfoBase<AddressOnlyClangRecordTypeInfo, FixedTypeInfo ,
420
- ClangFieldInfo> {
418
+ class AddressOnlyCXXClangRecordTypeInfo final
419
+ : public StructTypeInfoBase<AddressOnlyCXXClangRecordTypeInfo ,
420
+ FixedTypeInfo, ClangFieldInfo> {
421
421
const clang::RecordDecl *ClangDecl;
422
422
423
423
const clang::CXXConstructorDecl *findCopyConstructor () const {
@@ -490,10 +490,10 @@ namespace {
490
490
}
491
491
492
492
public:
493
- AddressOnlyClangRecordTypeInfo (ArrayRef<ClangFieldInfo> fields,
494
- llvm::Type *storageType, Size size,
495
- Alignment align,
496
- const clang::RecordDecl *clangDecl)
493
+ AddressOnlyCXXClangRecordTypeInfo (ArrayRef<ClangFieldInfo> fields,
494
+ llvm::Type *storageType, Size size,
495
+ Alignment align,
496
+ const clang::RecordDecl *clangDecl)
497
497
: StructTypeInfoBase(StructTypeInfoKind::AddressOnlyClangRecordTypeInfo,
498
498
fields, storageType, size,
499
499
// We can't assume any spare bits in a C++ type
@@ -513,7 +513,7 @@ namespace {
513
513
if (!destructor || destructor->isTrivial ()) {
514
514
// If we didn't find a destructor to call, bail out to the parent
515
515
// implementation.
516
- StructTypeInfoBase<AddressOnlyClangRecordTypeInfo , FixedTypeInfo,
516
+ StructTypeInfoBase<AddressOnlyCXXClangRecordTypeInfo , FixedTypeInfo,
517
517
ClangFieldInfo>::destroy (IGF, address, T,
518
518
isOutlined);
519
519
return ;
@@ -595,7 +595,7 @@ namespace {
595
595
destAddr.getAddress ());
596
596
return ;
597
597
}
598
- StructTypeInfoBase<AddressOnlyClangRecordTypeInfo , FixedTypeInfo,
598
+ StructTypeInfoBase<AddressOnlyCXXClangRecordTypeInfo , FixedTypeInfo,
599
599
ClangFieldInfo>::initializeWithCopy (IGF, destAddr,
600
600
srcAddr, T,
601
601
isOutlined);
@@ -609,10 +609,9 @@ namespace {
609
609
destAddr.getAddress ());
610
610
return ;
611
611
}
612
- StructTypeInfoBase<AddressOnlyClangRecordTypeInfo, FixedTypeInfo,
613
- ClangFieldInfo>::assignWithCopy (IGF, destAddr,
614
- srcAddr, T,
615
- isOutlined);
612
+ StructTypeInfoBase<AddressOnlyCXXClangRecordTypeInfo, FixedTypeInfo,
613
+ ClangFieldInfo>::assignWithCopy (IGF, destAddr, srcAddr,
614
+ T, isOutlined);
616
615
}
617
616
618
617
void initializeWithTake (IRGenFunction &IGF, Address dest, Address src,
@@ -625,9 +624,8 @@ namespace {
625
624
return ;
626
625
}
627
626
628
- StructTypeInfoBase<AddressOnlyClangRecordTypeInfo, FixedTypeInfo,
629
- ClangFieldInfo>::initializeWithTake (IGF, dest,
630
- src, T,
627
+ StructTypeInfoBase<AddressOnlyCXXClangRecordTypeInfo, FixedTypeInfo,
628
+ ClangFieldInfo>::initializeWithTake (IGF, dest, src, T,
631
629
isOutlined);
632
630
}
633
631
@@ -641,9 +639,8 @@ namespace {
641
639
return ;
642
640
}
643
641
644
- StructTypeInfoBase<AddressOnlyClangRecordTypeInfo, FixedTypeInfo,
645
- ClangFieldInfo>::assignWithTake (IGF, dest,
646
- src, T,
642
+ StructTypeInfoBase<AddressOnlyCXXClangRecordTypeInfo, FixedTypeInfo,
643
+ ClangFieldInfo>::assignWithTake (IGF, dest, src, T,
647
644
isOutlined);
648
645
}
649
646
@@ -1045,7 +1042,7 @@ class ClangRecordLowering {
1045
1042
const TypeInfo *createTypeInfo (llvm::StructType *llvmType) {
1046
1043
llvmType->setBody (LLVMFields, /* packed*/ true );
1047
1044
if (SwiftType.getStructOrBoundGenericStruct ()->isCxxNonTrivial ()) {
1048
- return AddressOnlyClangRecordTypeInfo ::create (
1045
+ return AddressOnlyCXXClangRecordTypeInfo ::create (
1049
1046
FieldInfos, llvmType, TotalStride, TotalAlignment, ClangDecl);
1050
1047
}
1051
1048
return LoadableClangRecordTypeInfo::create (
@@ -1265,8 +1262,8 @@ class ClangRecordLowering {
1265
1262
case StructTypeInfoKind::LoadableClangRecordTypeInfo: \
1266
1263
return structTI.as <LoadableClangRecordTypeInfo>().op (IGF, __VA_ARGS__); \
1267
1264
case StructTypeInfoKind::AddressOnlyClangRecordTypeInfo: \
1268
- return structTI.as <AddressOnlyClangRecordTypeInfo >().op (IGF, \
1269
- __VA_ARGS__); \
1265
+ return structTI.as <AddressOnlyCXXClangRecordTypeInfo >().op (IGF, \
1266
+ __VA_ARGS__); \
1270
1267
case StructTypeInfoKind::LoadableStructTypeInfo: \
1271
1268
return structTI.as <LoadableStructTypeInfo>().op (IGF, __VA_ARGS__); \
1272
1269
case StructTypeInfoKind::FixedStructTypeInfo: \
0 commit comments