Skip to content

Commit 707ea39

Browse files
drexindrexin
authored
Merge pull request #78983 from drexin/wip-143429827-6.1
[6.1][Runtime] Add compatibility override support for CVW runtime functions
2 parents 72810db + 6024b5e commit 707ea39

File tree

13 files changed

+559
-171
lines changed

13 files changed

+559
-171
lines changed

‎include/swift/Runtime/Enum.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ void swift_initEnumMetadataSingleCase(EnumMetadata *enumType,
4747
EnumLayoutFlags flags,
4848
const TypeLayout *payload);
4949

50+
SWIFT_RUNTIME_EXPORT
51+
void swift_cvw_initEnumMetadataSingleCaseWithLayoutString(
52+
EnumMetadata *self, EnumLayoutFlags layoutFlags,
53+
const Metadata *payloadType);
54+
5055
SWIFT_RUNTIME_EXPORT
5156
void swift_initEnumMetadataSingleCaseWithLayoutString(
5257
EnumMetadata *self, EnumLayoutFlags layoutFlags,
@@ -65,6 +70,11 @@ void swift_initEnumMetadataSinglePayload(EnumMetadata *enumType,
6570
const TypeLayout *payload,
6671
unsigned emptyCases);
6772

73+
SWIFT_RUNTIME_EXPORT
74+
void swift_cvw_initEnumMetadataSinglePayloadWithLayoutString(
75+
EnumMetadata *enumType, EnumLayoutFlags flags, const Metadata *payload,
76+
unsigned emptyCases);
77+
6878
SWIFT_RUNTIME_EXPORT
6979
void swift_initEnumMetadataSinglePayloadWithLayoutString(
7080
EnumMetadata *enumType, EnumLayoutFlags flags, const Metadata *payload,
@@ -123,6 +133,11 @@ void swift_initEnumMetadataMultiPayload(EnumMetadata *enumType,
123133
unsigned numPayloads,
124134
const TypeLayout * const *payloadTypes);
125135

136+
SWIFT_RUNTIME_EXPORT
137+
void swift_cvw_initEnumMetadataMultiPayloadWithLayoutString(
138+
EnumMetadata *enumType, EnumLayoutFlags flags, unsigned numPayloads,
139+
const Metadata *const *payloadTypes);
140+
126141
SWIFT_RUNTIME_EXPORT
127142
void swift_initEnumMetadataMultiPayloadWithLayoutString(EnumMetadata *enumType,
128143
EnumLayoutFlags flags,

‎include/swift/Runtime/Metadata.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,12 @@ swift_allocateGenericClassMetadata(const ClassDescriptor *description,
319319
const void *arguments,
320320
const GenericClassMetadataPattern *pattern);
321321

322+
SWIFT_EXTERN_C SWIFT_RETURNS_NONNULL SWIFT_NODISCARD
323+
SWIFT_RUNTIME_EXPORT_ATTRIBUTE ClassMetadata *
324+
swift_cvw_allocateGenericClassMetadataWithLayoutString(
325+
const ClassDescriptor *description, const void *arguments,
326+
const GenericClassMetadataPattern *pattern);
327+
322328
SWIFT_EXTERN_C SWIFT_RETURNS_NONNULL SWIFT_NODISCARD SWIFT_RUNTIME_EXPORT_ATTRIBUTE
323329
ClassMetadata *
324330
swift_allocateGenericClassMetadataWithLayoutString(
@@ -336,6 +342,12 @@ swift_allocateGenericValueMetadata(const ValueTypeDescriptor *description,
336342
const GenericValueMetadataPattern *pattern,
337343
size_t extraDataSize);
338344

345+
SWIFT_EXTERN_C SWIFT_RETURNS_NONNULL SWIFT_NODISCARD
346+
SWIFT_RUNTIME_EXPORT_ATTRIBUTE ValueMetadata *
347+
swift_cvw_allocateGenericValueMetadataWithLayoutString(
348+
const ValueTypeDescriptor *description, const void *arguments,
349+
const GenericValueMetadataPattern *pattern, size_t extraDataSize);
350+
339351
SWIFT_EXTERN_C SWIFT_RETURNS_NONNULL SWIFT_NODISCARD SWIFT_RUNTIME_EXPORT_ATTRIBUTE
340352
ValueMetadata *
341353
swift_allocateGenericValueMetadataWithLayoutString(
@@ -674,6 +686,12 @@ void swift_initStructMetadata(StructMetadata *self,
674686
const TypeLayout * const *fieldTypes,
675687
uint32_t *fieldOffsets);
676688

689+
SWIFT_RUNTIME_EXPORT
690+
void swift_cvw_initStructMetadataWithLayoutString(
691+
StructMetadata *self, StructLayoutFlags flags, size_t numFields,
692+
const uint8_t *const *fieldTypes, const uint8_t *fieldTags,
693+
uint32_t *fieldOffsets);
694+
677695
SWIFT_RUNTIME_EXPORT
678696
void swift_initStructMetadataWithLayoutString(StructMetadata *self,
679697
StructLayoutFlags flags,

‎include/swift/Runtime/RuntimeFunctions.def

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,12 +1027,12 @@ FUNCTION(AllocateGenericClassMetadata, swift_allocateGenericClassMetadata,
10271027
EFFECT(MetaData),
10281028
UNKNOWN_MEMEFFECTS)
10291029

1030-
// Metadata *swift_allocateGenericClassMetadataWithLayoutString(
1030+
// Metadata *swift_cvw_allocateGenericClassMetadataWithLayoutString(
10311031
// ClassDescriptor *type,
10321032
// const void * const *arguments,
10331033
// const void *template);
10341034
FUNCTION(AllocateGenericClassMetadataWithLayoutString,
1035-
swift_allocateGenericClassMetadataWithLayoutString,
1035+
swift_cvw_allocateGenericClassMetadataWithLayoutString,
10361036
C_CC, AlwaysAvailable,
10371037
RETURNS(TypeMetadataPtrTy),
10381038
ARGS(TypeContextDescriptorPtrTy, Int8PtrPtrTy, Int8PtrTy),
@@ -1052,13 +1052,13 @@ FUNCTION(AllocateGenericValueMetadata, swift_allocateGenericValueMetadata,
10521052
EFFECT(MetaData),
10531053
UNKNOWN_MEMEFFECTS)
10541054

1055-
// Metadata *swift_allocateGenericValueMetadataWithLayoutString(
1055+
// Metadata *swift_cvw_allocateGenericValueMetadataWithLayoutString(
10561056
// ValueTypeDescriptor *type,
10571057
// const void * const *arguments,
10581058
// const void *template,
10591059
// size_t extraSize);
10601060
FUNCTION(AllocateGenericValueMetadataWithLayoutString,
1061-
swift_allocateGenericValueMetadataWithLayoutString,
1061+
swift_cvw_allocateGenericValueMetadataWithLayoutString,
10621062
C_CC, AlwaysAvailable,
10631063
RETURNS(TypeMetadataPtrTy),
10641064
ARGS(TypeContextDescriptorPtrTy, Int8PtrPtrTy, Int8PtrTy, SizeTy),
@@ -1489,14 +1489,14 @@ FUNCTION(InitStructMetadata,
14891489
EFFECT(MetaData),
14901490
UNKNOWN_MEMEFFECTS)
14911491

1492-
// void swift_initStructMetadataWithLayoutString(Metadata *structType,
1492+
// void swift_cvw_initStructMetadataWithLayoutString(Metadata *structType,
14931493
// StructLayoutFlags flags,
14941494
// size_t numFields,
14951495
// uint8_t * const *fieldTypes,
14961496
// const uint8_t *fieldTags
14971497
// uint32_t *fieldOffsets);
14981498
FUNCTION(InitStructMetadataWithLayoutString,
1499-
swift_initStructMetadataWithLayoutString, C_CC, AlwaysAvailable,
1499+
swift_cvw_initStructMetadataWithLayoutString, C_CC, AlwaysAvailable,
15001500
RETURNS(VoidTy),
15011501
ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
15021502
Int8PtrPtrTy->getPointerTo(0),
@@ -1518,11 +1518,11 @@ FUNCTION(InitEnumMetadataSingleCase,
15181518
EFFECT(MetaData),
15191519
UNKNOWN_MEMEFFECTS)
15201520

1521-
// void swift_initEnumMetadataSingleCaseWithLayoutString(Metadata *enumType,
1521+
// void swift_cvw_initEnumMetadataSingleCaseWithLayoutString(Metadata *enumType,
15221522
// EnumLayoutFlags flags,
15231523
// Metadata *payload);
15241524
FUNCTION(InitEnumMetadataSingleCaseWithLayoutString,
1525-
swift_initEnumMetadataSingleCaseWithLayoutString,
1525+
swift_cvw_initEnumMetadataSingleCaseWithLayoutString,
15261526
C_CC, AlwaysAvailable,
15271527
RETURNS(VoidTy),
15281528
ARGS(TypeMetadataPtrTy, SizeTy, TypeMetadataPtrTy),
@@ -1543,12 +1543,12 @@ FUNCTION(InitEnumMetadataSinglePayload,
15431543
EFFECT(MetaData),
15441544
UNKNOWN_MEMEFFECTS)
15451545

1546-
// void swift_initEnumMetadataSinglePayloadWithLayoutString(Metadata *enumType,
1546+
// void swift_cvw_initEnumMetadataSinglePayloadWithLayoutString(Metadata *enumType,
15471547
// EnumLayoutFlags flags,
15481548
// Metadata *payload,
15491549
// unsigned num_empty_cases);
15501550
FUNCTION(InitEnumMetadataSinglePayloadWithLayoutString,
1551-
swift_initEnumMetadataSinglePayloadWithLayoutString,
1551+
swift_cvw_initEnumMetadataSinglePayloadWithLayoutString,
15521552
C_CC, AlwaysAvailable,
15531553
RETURNS(VoidTy),
15541554
ARGS(TypeMetadataPtrTy, SizeTy, TypeMetadataPtrTy, Int32Ty),
@@ -1570,12 +1570,12 @@ FUNCTION(InitEnumMetadataMultiPayload,
15701570
UNKNOWN_MEMEFFECTS)
15711571

15721572
// void
1573-
// swift_initEnumMetadataMultiPayloadWithLayoutString(Metadata *enumType,
1573+
// swift_cvw_initEnumMetadataMultiPayloadWithLayoutString(Metadata *enumType,
15741574
// EnumLayoutFlags layoutFlags,
15751575
// size_t numPayloads,
15761576
// Metadata * const *payloadTypes);
15771577
FUNCTION(InitEnumMetadataMultiPayloadWithLayoutString,
1578-
swift_initEnumMetadataMultiPayloadWithLayoutString,
1578+
swift_cvw_initEnumMetadataMultiPayloadWithLayoutString,
15791579
C_CC, AlwaysAvailable,
15801580
RETURNS(VoidTy),
15811581
ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, TypeMetadataPtrPtrTy),
@@ -2684,9 +2684,9 @@ FUNCTION(StoreMultiPayloadEnumTagSinglePayload,
26842684
EFFECT(NoEffect),
26852685
UNKNOWN_MEMEFFECTS)
26862686

2687-
// void swift_generic_destroy(opaque*, const Metadata* type);
2687+
// void swift_cvw_destroy(opaque*, const Metadata* type);
26882688
FUNCTION(GenericDestroy,
2689-
swift_generic_destroy,
2689+
swift_cvw_destroy,
26902690
C_CC, AlwaysAvailable,
26912691
RETURNS(VoidTy),
26922692
ARGS(Int8PtrTy, TypeMetadataPtrTy),
@@ -2695,49 +2695,49 @@ FUNCTION(GenericDestroy,
26952695
UNKNOWN_MEMEFFECTS)
26962696

26972697

2698-
// void *swift_generic_assignWithCopy(opaque* dest, opaque* src, const Metadata* type);
2698+
// void *swift_cvw_assignWithCopy(opaque* dest, opaque* src, const Metadata* type);
26992699
FUNCTION(GenericAssignWithCopy,
2700-
swift_generic_assignWithCopy,
2700+
swift_cvw_assignWithCopy,
27012701
C_CC, AlwaysAvailable,
27022702
RETURNS(Int8PtrTy),
27032703
ARGS(Int8PtrTy, Int8PtrTy, TypeMetadataPtrTy),
27042704
ATTRS(NoUnwind),
27052705
EFFECT(RefCounting, Deallocating),
27062706
UNKNOWN_MEMEFFECTS)
27072707

2708-
// void *swift_generic_assignWithTake(opaque* dest, opaque* src, const Metadata* type);
2708+
// void *swift_cvw_assignWithTake(opaque* dest, opaque* src, const Metadata* type);
27092709
FUNCTION(GenericAssignWithTake,
2710-
swift_generic_assignWithTake,
2710+
swift_cvw_assignWithTake,
27112711
C_CC, AlwaysAvailable,
27122712
RETURNS(Int8PtrTy),
27132713
ARGS(Int8PtrTy, Int8PtrTy, TypeMetadataPtrTy),
27142714
ATTRS(NoUnwind),
27152715
EFFECT(RefCounting, Deallocating),
27162716
UNKNOWN_MEMEFFECTS)
27172717

2718-
// void *swift_generic_initWithCopy(opaque* dest, opaque* src, const Metadata* type);
2718+
// void *swift_cvw_initWithCopy(opaque* dest, opaque* src, const Metadata* type);
27192719
FUNCTION(GenericInitWithCopy,
2720-
swift_generic_initWithCopy,
2720+
swift_cvw_initWithCopy,
27212721
C_CC, AlwaysAvailable,
27222722
RETURNS(Int8PtrTy),
27232723
ARGS(Int8PtrTy, Int8PtrTy, TypeMetadataPtrTy),
27242724
ATTRS(NoUnwind),
27252725
EFFECT(RefCounting),
27262726
UNKNOWN_MEMEFFECTS)
27272727

2728-
// void *swift_generic_initWithTake(opaque* dest, opaque* src, const Metadata* type);
2728+
// void *swift_cvw_initWithTake(opaque* dest, opaque* src, const Metadata* type);
27292729
FUNCTION(GenericInitWithTake,
2730-
swift_generic_initWithTake,
2730+
swift_cvw_initWithTake,
27312731
C_CC, AlwaysAvailable,
27322732
RETURNS(Int8PtrTy),
27332733
ARGS(Int8PtrTy, Int8PtrTy, TypeMetadataPtrTy),
27342734
ATTRS(NoUnwind),
27352735
EFFECT(RefCounting),
27362736
UNKNOWN_MEMEFFECTS)
27372737

2738-
// void *swift_generic_initializeBufferWithCopyOfBuffer(ValueBuffer* dest, ValueBuffer* src, const Metadata* type);
2738+
// void *swift_cvw_initializeBufferWithCopyOfBuffer(ValueBuffer* dest, ValueBuffer* src, const Metadata* type);
27392739
FUNCTION(GenericInitializeBufferWithCopyOfBuffer,
2740-
swift_generic_initializeBufferWithCopyOfBuffer,
2740+
swift_cvw_initializeBufferWithCopyOfBuffer,
27412741
C_CC, AlwaysAvailable,
27422742
RETURNS(Int8PtrTy),
27432743
ARGS(getFixedBufferTy()->getPointerTo(),
@@ -2747,113 +2747,113 @@ FUNCTION(GenericInitializeBufferWithCopyOfBuffer,
27472747
EFFECT(RefCounting),
27482748
UNKNOWN_MEMEFFECTS)
27492749

2750-
// unsigned swift_singletonEnum_getEnumTag(swift::OpaqueValue *address,
2750+
// unsigned swift_cvw_singletonEnum_getEnumTag(swift::OpaqueValue *address,
27512751
// const Metadata *metadata);
27522752
FUNCTION(SingletonEnumGetEnumTag,
2753-
swift_singletonEnum_getEnumTag,
2753+
swift_cvw_singletonEnum_getEnumTag,
27542754
C_CC, AlwaysAvailable,
27552755
RETURNS(Int32Ty),
27562756
ARGS(Int8PtrTy, TypeMetadataPtrTy),
27572757
ATTRS(NoUnwind, WillReturn),
27582758
EFFECT(NoEffect),
27592759
UNKNOWN_MEMEFFECTS)
27602760

2761-
// void swift_singletonEnum_destructiveInjectEnumTag(swift::OpaqueValue *address,
2761+
// void swift_cvw_singletonEnum_destructiveInjectEnumTag(swift::OpaqueValue *address,
27622762
// unsigned tag,
27632763
// const Metadata *metadata)
27642764
FUNCTION(SingletonEnumDestructiveInjectEnumTag,
2765-
swift_singletonEnum_destructiveInjectEnumTag,
2765+
swift_cvw_singletonEnum_destructiveInjectEnumTag,
27662766
C_CC, AlwaysAvailable,
27672767
RETURNS(VoidTy),
27682768
ARGS(Int8PtrTy, Int32Ty, TypeMetadataPtrTy),
27692769
ATTRS(NoUnwind, WillReturn),
27702770
EFFECT(NoEffect),
27712771
UNKNOWN_MEMEFFECTS)
27722772

2773-
// unsigned swift_enumSimple_getEnumTag(swift::OpaqueValue *address,
2773+
// unsigned swift_cvw_enumSimple_getEnumTag(swift::OpaqueValue *address,
27742774
// const Metadata *metadata);
27752775
FUNCTION(EnumSimpleGetEnumTag,
2776-
swift_enumSimple_getEnumTag,
2776+
swift_cvw_enumSimple_getEnumTag,
27772777
C_CC, AlwaysAvailable,
27782778
RETURNS(Int32Ty),
27792779
ARGS(Int8PtrTy, TypeMetadataPtrTy),
27802780
ATTRS(NoUnwind, WillReturn),
27812781
EFFECT(NoEffect),
27822782
UNKNOWN_MEMEFFECTS)
27832783

2784-
// unsigned swift_enumSimple_destructiveInjectEnumTag(swift::OpaqueValue *address,
2784+
// unsigned swift_cvw_enumSimple_destructiveInjectEnumTag(swift::OpaqueValue *address,
27852785
// unsigned tag,
27862786
// const Metadata *metadata)
27872787
FUNCTION(EnumSimpleDestructiveInjectEnumTag,
2788-
swift_enumSimple_destructiveInjectEnumTag,
2788+
swift_cvw_enumSimple_destructiveInjectEnumTag,
27892789
C_CC, AlwaysAvailable,
27902790
RETURNS(VoidTy),
27912791
ARGS(Int8PtrTy, Int32Ty, TypeMetadataPtrTy),
27922792
ATTRS(NoUnwind, WillReturn),
27932793
EFFECT(NoEffect),
27942794
UNKNOWN_MEMEFFECTS)
27952795

2796-
// unsigned swift_enumFn_getEnumTag(swift::OpaqueValue *address,
2796+
// unsigned swift_cvw_enumFn_getEnumTag(swift::OpaqueValue *address,
27972797
// const Metadata *metadata);
27982798
FUNCTION(EnumFnGetEnumTag,
2799-
swift_enumFn_getEnumTag,
2799+
swift_cvw_enumFn_getEnumTag,
28002800
C_CC, AlwaysAvailable,
28012801
RETURNS(Int32Ty),
28022802
ARGS(Int8PtrTy, TypeMetadataPtrTy),
28032803
ATTRS(NoUnwind, WillReturn),
28042804
EFFECT(NoEffect),
28052805
UNKNOWN_MEMEFFECTS)
28062806

2807-
// unsigned swift_multiPayloadEnumGeneric_getEnumTag(opaque* address,
2807+
// unsigned swift_cvw_multiPayloadEnumGeneric_getEnumTag(opaque* address,
28082808
// const Metadata *type);
28092809
FUNCTION(MultiPayloadEnumGenericGetEnumTag,
2810-
swift_multiPayloadEnumGeneric_getEnumTag,
2810+
swift_cvw_multiPayloadEnumGeneric_getEnumTag,
28112811
C_CC, AlwaysAvailable,
28122812
RETURNS(Int32Ty),
28132813
ARGS(Int8PtrTy, TypeMetadataPtrTy),
28142814
ATTRS(NoUnwind, WillReturn),
28152815
EFFECT(NoEffect),
28162816
UNKNOWN_MEMEFFECTS)
28172817

2818-
// void swift_multiPayloadEnumGeneric_destructiveInjectEnumTag(swift::OpaqueValue *address,
2818+
// void swift_cvw_multiPayloadEnumGeneric_destructiveInjectEnumTag(swift::OpaqueValue *address,
28192819
// unsigned tag,
28202820
// const Metadata *metadata)
28212821
FUNCTION(MultiPayloadEnumGenericDestructiveInjectEnumTag,
2822-
swift_multiPayloadEnumGeneric_destructiveInjectEnumTag,
2822+
swift_cvw_multiPayloadEnumGeneric_destructiveInjectEnumTag,
28232823
C_CC, AlwaysAvailable,
28242824
RETURNS(VoidTy),
28252825
ARGS(Int8PtrTy, Int32Ty, TypeMetadataPtrTy),
28262826
ATTRS(NoUnwind, WillReturn),
28272827
EFFECT(NoEffect),
28282828
UNKNOWN_MEMEFFECTS)
28292829

2830-
// unsigned swift_singlePayloadEnumGeneric_getEnumTag(swift::OpaqueValue *address,
2830+
// unsigned swift_cvw_singlePayloadEnumGeneric_getEnumTag(swift::OpaqueValue *address,
28312831
// const Metadata *metadata);
28322832
FUNCTION(SinglePayloadEnumGenericGetEnumTag,
2833-
swift_singlePayloadEnumGeneric_getEnumTag,
2833+
swift_cvw_singlePayloadEnumGeneric_getEnumTag,
28342834
C_CC, AlwaysAvailable,
28352835
RETURNS(Int32Ty),
28362836
ARGS(Int8PtrTy, TypeMetadataPtrTy),
28372837
ATTRS(NoUnwind, WillReturn),
28382838
EFFECT(NoEffect),
28392839
UNKNOWN_MEMEFFECTS)
28402840

2841-
// void swift_singlePayloadEnumGeneric_destructiveInjectEnumTag(swift::OpaqueValue *address,
2841+
// void swift_cvw_singlePayloadEnumGeneric_destructiveInjectEnumTag(swift::OpaqueValue *address,
28422842
// unsigned tag,
28432843
// const Metadata *metadata)
28442844
FUNCTION(SinglePayloadEnumGenericDestructiveInjectEnumTag,
2845-
swift_singlePayloadEnumGeneric_destructiveInjectEnumTag,
2845+
swift_cvw_singlePayloadEnumGeneric_destructiveInjectEnumTag,
28462846
C_CC, AlwaysAvailable,
28472847
RETURNS(VoidTy),
28482848
ARGS(Int8PtrTy, Int32Ty, TypeMetadataPtrTy),
28492849
ATTRS(NoUnwind, WillReturn),
28502850
EFFECT(NoEffect),
28512851
UNKNOWN_MEMEFFECTS)
28522852

2853-
// void swift_generic_instantiateLayoutString(const uint8_t* layoutStr,
2853+
// void swift_cvw_instantiateLayoutString(const uint8_t* layoutStr,
28542854
// Metadata* type);
28552855
FUNCTION(GenericInstantiateLayoutString,
2856-
swift_generic_instantiateLayoutString,
2856+
swift_cvw_instantiateLayoutString,
28572857
C_CC, AlwaysAvailable,
28582858
RETURNS(VoidTy),
28592859
ARGS(Int8PtrTy, TypeMetadataPtrTy),

0 commit comments

Comments
 (0)