IRGen: Address llvm::Type::getPointerTo deprecation

See https://github.com/llvm/llvm-project/pull/113331.
2025-12-14 20:36:38 +01:00 · 2025-07-21 10:43:27 +01:00
parent 2920ea84d1
commit f8577a2731
39 changed files with 485 additions and 802 deletions
--- a/include/swift/Runtime/RuntimeFunctions.def
+++ b/include/swift/Runtime/RuntimeFunctions.def
@@ -175,7 +175,7 @@ FUNCTION(SlowDealloc, Swift, swift_slowDealloc, C_CC, AlwaysAvailable,
 // void swift_willThrow(error *ptr);
 FUNCTION(WillThrow, Swift, swift_willThrow, SwiftCC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(Int8PtrTy, ErrorPtrTy->getPointerTo()),
+         ARGS(Int8PtrTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::NoEffect),
         UNKNOWN_MEMEFFECTS)
@@ -759,10 +759,7 @@ FUNCTION(ArrayDestroy, Swift, swift_arrayDestroy, C_CC, AlwaysAvailable,
 FUNCTION(GetFunctionMetadata, Swift, swift_getFunctionTypeMetadata,
         C_CC, AlwaysAvailable,
         RETURNS(TypeMetadataPtrTy),
-         ARGS(SizeTy,
-              TypeMetadataPtrTy->getPointerTo(0),
-              Int32Ty->getPointerTo(0),
-              TypeMetadataPtrTy),
+         ARGS(SizeTy, PtrTy, PtrTy, TypeMetadataPtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         MEMEFFECTS(ReadOnly))
@@ -777,11 +774,7 @@ FUNCTION(GetFunctionMetadataDifferentiable,
         Swift, swift_getFunctionTypeMetadataDifferentiable,
         C_CC, AlwaysAvailable,
         RETURNS(TypeMetadataPtrTy),
-         ARGS(SizeTy,
-              SizeTy,
-              TypeMetadataPtrTy->getPointerTo(0),
-              Int32Ty->getPointerTo(0),
-              TypeMetadataPtrTy),
+         ARGS(SizeTy, SizeTy, PtrTy, PtrTy, TypeMetadataPtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         MEMEFFECTS(ReadOnly))
@@ -801,8 +794,8 @@ FUNCTION(GetFunctionMetadataExtended,
         RETURNS(TypeMetadataPtrTy),
         ARGS(SizeTy,
              SizeTy,
-              TypeMetadataPtrTy->getPointerTo(0),
-              Int32Ty->getPointerTo(0),
+              PtrTy,
+              PtrTy,
              TypeMetadataPtrTy,
              TypeMetadataPtrTy,
              Int32Ty,
@@ -824,8 +817,8 @@ FUNCTION(GetFunctionMetadataGlobalActor,
         RETURNS(TypeMetadataPtrTy),
         ARGS(SizeTy,
              SizeTy,
-              TypeMetadataPtrTy->getPointerTo(0),
-              Int32Ty->getPointerTo(0),
+              PtrTy,
+              PtrTy,
              TypeMetadataPtrTy,
              TypeMetadataPtrTy),
         ATTRS(NoUnwind),
@@ -845,8 +838,8 @@ FUNCTION(GetFunctionMetadataGlobalActorBackDeploy,
         RETURNS(TypeMetadataPtrTy),
         ARGS(SizeTy,
              SizeTy,
-              TypeMetadataPtrTy->getPointerTo(0),
-              Int32Ty->getPointerTo(0),
+              PtrTy,
+              PtrTy,
              TypeMetadataPtrTy,
              TypeMetadataPtrTy),
         ATTRS(NoUnwind),
@@ -963,7 +956,7 @@ FUNCTION(GetCanonicalPrespecializedGenericMetadata,
         Swift, swift_getCanonicalPrespecializedGenericMetadata,
         SwiftCC, GetCanonicalPrespecializedGenericMetadataAvailability,
         RETURNS(TypeMetadataResponseTy),
-         ARGS(SizeTy, Int8PtrTy, TypeContextDescriptorPtrTy, OnceTy->getPointerTo()),
+         ARGS(SizeTy, Int8PtrTy, TypeContextDescriptorPtrTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         MEMEFFECTS(ReadOnly))
@@ -1108,22 +1101,14 @@ FUNCTION(GetWitnessTableRelative, Swift, swift_getWitnessTableRelative, C_CC, Al
 FUNCTION(GetAssociatedTypeWitness, Swift, swift_getAssociatedTypeWitness,
         SwiftCC, AlwaysAvailable,
         RETURNS(TypeMetadataResponseTy),
-         ARGS(SizeTy,
-              WitnessTablePtrTy,
-              TypeMetadataPtrTy,
-              ProtocolRequirementStructTy->getPointerTo(),
-              ProtocolRequirementStructTy->getPointerTo()),
+         ARGS(SizeTy, WitnessTablePtrTy, TypeMetadataPtrTy, PtrTy, PtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::MetaData), // ?
         MEMEFFECTS(ReadNone))
 FUNCTION(GetAssociatedTypeWitnessRelative, Swift, swift_getAssociatedTypeWitnessRelative,
         SwiftCC, AlwaysAvailable,
         RETURNS(TypeMetadataResponseTy),
-         ARGS(SizeTy,
-              WitnessTablePtrTy,
-              TypeMetadataPtrTy,
-              ProtocolRequirementStructTy->getPointerTo(),
-              ProtocolRequirementStructTy->getPointerTo()),
+         ARGS(SizeTy, WitnessTablePtrTy, TypeMetadataPtrTy, PtrTy, PtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::MetaData), // ?
         MEMEFFECTS(ReadNone))
@@ -1141,8 +1126,8 @@ FUNCTION(GetAssociatedConformanceWitness,
         ARGS(WitnessTablePtrTy,
              TypeMetadataPtrTy,
              TypeMetadataPtrTy,
-              ProtocolRequirementStructTy->getPointerTo(),
-              ProtocolRequirementStructTy->getPointerTo()),
+              PtrTy,
+              PtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::MetaData), // ?
         MEMEFFECTS(ReadNone))
@@ -1152,8 +1137,8 @@ FUNCTION(GetAssociatedConformanceWitnessRelative,
         ARGS(WitnessTablePtrTy,
              TypeMetadataPtrTy,
              TypeMetadataPtrTy,
-              ProtocolRequirementStructTy->getPointerTo(),
-              ProtocolRequirementStructTy->getPointerTo()),
+              PtrTy,
+              PtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::MetaData), // ?
         MEMEFFECTS(ReadNone))
@@ -1248,8 +1233,7 @@ FUNCTION(GetObjCClassFromObject, Swift, swift_getObjCClassFromObject,
 //                                             value_witness_table_t *proposed);
 FUNCTION(GetTupleMetadata, Swift, swift_getTupleTypeMetadata, SwiftCC, AlwaysAvailable,
         RETURNS(TypeMetadataResponseTy),
-         ARGS(SizeTy, SizeTy, TypeMetadataPtrTy->getPointerTo(0),
-              Int8PtrTy, WitnessTablePtrTy),
+         ARGS(SizeTy, SizeTy, PtrTy, Int8PtrTy, WitnessTablePtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::MetaData),
         MEMEFFECTS(ReadOnly))
@@ -1285,8 +1269,7 @@ FUNCTION(GetTupleMetadata3, Swift, swift_getTupleTypeMetadata3, SwiftCC, AlwaysA
 //                               const TypeLayout * const *elts);
 FUNCTION(GetTupleLayout, Swift, swift_getTupleTypeLayout, SwiftCC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(FullTypeLayoutTy->getPointerTo(0), Int32Ty->getPointerTo(0),
-              SizeTy, Int8PtrPtrTy->getPointerTo(0)),
+         ARGS(PtrTy, PtrTy, SizeTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::NoEffect),
         UNKNOWN_MEMEFFECTS)
@@ -1296,7 +1279,7 @@ FUNCTION(GetTupleLayout, Swift, swift_getTupleTypeLayout, SwiftCC, AlwaysAvailab
 //                                  const TypeLayout *elt1);
 FUNCTION(GetTupleLayout2, Swift, swift_getTupleTypeLayout2, SwiftCC, AlwaysAvailable,
         RETURNS(SizeTy),
-         ARGS(FullTypeLayoutTy->getPointerTo(0), Int8PtrPtrTy, Int8PtrPtrTy),
+         ARGS(PtrTy, Int8PtrPtrTy, Int8PtrPtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::NoEffect),
         UNKNOWN_MEMEFFECTS)
@@ -1307,8 +1290,7 @@ FUNCTION(GetTupleLayout2, Swift, swift_getTupleTypeLayout2, SwiftCC, AlwaysAvail
 //                                      const TypeLayout *elt2);
 FUNCTION(GetTupleLayout3, Swift, swift_getTupleTypeLayout3, SwiftCC, AlwaysAvailable,
         RETURNS(OffsetPairTy),
-         ARGS(FullTypeLayoutTy->getPointerTo(0),
-              Int8PtrPtrTy, Int8PtrPtrTy, Int8PtrPtrTy),
+         ARGS(PtrTy, Int8PtrPtrTy, Int8PtrPtrTy, Int8PtrPtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::NoEffect),
         UNKNOWN_MEMEFFECTS)
@@ -1335,8 +1317,7 @@ FUNCTION(GetExistentialMetadata,
         Swift, swift_getExistentialTypeMetadata,
         C_CC, AlwaysAvailable,
         RETURNS(TypeMetadataPtrTy),
-         ARGS(Int1Ty, TypeMetadataPtrTy, SizeTy,
-              ProtocolDescriptorRefTy->getPointerTo()),
+         ARGS(Int1Ty, TypeMetadataPtrTy, SizeTy, PtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::MetaData), // ?
         MEMEFFECTS(ReadOnly))
@@ -1396,9 +1377,7 @@ FUNCTION(RelocateClassMetadata,
 FUNCTION(InitClassMetadata,
         Swift, swift_initClassMetadata, C_CC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
-              Int8PtrPtrTy->getPointerTo(),
-              SizeTy->getPointerTo()),
+         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, PtrTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -1411,9 +1390,7 @@ FUNCTION(InitClassMetadata,
 FUNCTION(UpdateClassMetadata,
         Swift, swift_updateClassMetadata, C_CC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
-              Int8PtrPtrTy->getPointerTo(),
-              SizeTy->getPointerTo()),
+         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, PtrTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -1426,9 +1403,7 @@ FUNCTION(UpdateClassMetadata,
 FUNCTION(InitClassMetadata2,
         Swift, swift_initClassMetadata2, SwiftCC, AlwaysAvailable,
         RETURNS(TypeMetadataDependencyTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
-              Int8PtrPtrTy->getPointerTo(),
-              SizeTy->getPointerTo()),
+         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, PtrTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -1441,9 +1416,7 @@ FUNCTION(InitClassMetadata2,
 FUNCTION(UpdateClassMetadata2,
         Swift, swift_updateClassMetadata2, SwiftCC, AlwaysAvailable,
         RETURNS(TypeMetadataDependencyTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
-              Int8PtrPtrTy->getPointerTo(),
-              SizeTy->getPointerTo()),
+         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, PtrTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -1456,7 +1429,7 @@ FUNCTION(UpdateClassMetadata2,
 FUNCTION(UpdatePureObjCClassMetadata,
         Swift, swift_updatePureObjCClassMetadata, SwiftCC, AlwaysAvailable,
         RETURNS(ObjCClassPtrTy),
-         ARGS(ObjCClassPtrTy, SizeTy, SizeTy, Int8PtrPtrTy->getPointerTo()),
+         ARGS(ObjCClassPtrTy, SizeTy, SizeTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -1467,9 +1440,7 @@ FUNCTION(UpdatePureObjCClassMetadata,
 FUNCTION(LookUpClassMethod,
         Swift, swift_lookUpClassMethod, C_CC, AlwaysAvailable,
         RETURNS(Int8PtrTy),
-         ARGS(TypeMetadataPtrTy,
-              MethodDescriptorStructTy->getPointerTo(),
-              TypeContextDescriptorPtrTy),
+         ARGS(TypeMetadataPtrTy, PtrTy, TypeContextDescriptorPtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::NoEffect),
         UNKNOWN_MEMEFFECTS)
@@ -1482,9 +1453,7 @@ FUNCTION(LookUpClassMethod,
 FUNCTION(InitStructMetadata,
         Swift, swift_initStructMetadata, C_CC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
-              Int8PtrPtrTy->getPointerTo(0),
-              Int32Ty->getPointerTo()),
+         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, PtrTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -1498,10 +1467,7 @@ FUNCTION(InitStructMetadata,
 FUNCTION(InitStructMetadataWithLayoutString,
         Swift, swift_cvw_initStructMetadataWithLayoutString, C_CC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy,
-              Int8PtrPtrTy->getPointerTo(0),
-              Int8PtrTy,
-              Int32Ty->getPointerTo()),
+         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, PtrTy, Int8PtrTy, PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -1564,7 +1530,7 @@ FUNCTION(InitEnumMetadataMultiPayload,
         Swift, swift_initEnumMetadataMultiPayload,
         C_CC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, Int8PtrPtrTy->getPointerTo(0)),
+         ARGS(TypeMetadataPtrTy, SizeTy, SizeTy, PtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -1603,10 +1569,7 @@ FUNCTION(GetEnumTagSinglePayloadGeneric,
         Swift, swift_getEnumTagSinglePayloadGeneric,
         SwiftCC, AlwaysAvailable,
         RETURNS(Int32Ty),
-         ARGS(OpaquePtrTy, Int32Ty, TypeMetadataPtrTy,
-              llvm::FunctionType::get(Int32Ty, {OpaquePtrTy, Int32Ty,
-                                                TypeMetadataPtrTy},
-                                      false)->getPointerTo()),
+         ARGS(OpaquePtrTy, Int32Ty, TypeMetadataPtrTy, PtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::NoEffect),
         MEMEFFECTS(ReadOnly))
@@ -1624,10 +1587,7 @@ FUNCTION(StoreEnumTagSinglePayloadGeneric,
         Swift, swift_storeEnumTagSinglePayloadGeneric,
         SwiftCC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(OpaquePtrTy, Int32Ty, Int32Ty, TypeMetadataPtrTy,
-              llvm::FunctionType::get(VoidTy, {OpaquePtrTy, Int32Ty, Int32Ty,
-                                               TypeMetadataPtrTy},
-                                      false)->getPointerTo()),
+         ARGS(OpaquePtrTy, Int32Ty, Int32Ty, TypeMetadataPtrTy, PtrTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::NoEffect),
         UNKNOWN_MEMEFFECTS)
@@ -1901,7 +1861,7 @@ FUNCTION(IsOptionalType,
 //                 void *context);
 FUNCTION(Once, Swift, swift_once, C_CC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(OnceTy->getPointerTo(), Int8PtrTy, Int8PtrTy),
+         ARGS(PtrTy, Int8PtrTy, Int8PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::Locking),
         UNKNOWN_MEMEFFECTS)
@@ -1936,7 +1896,7 @@ FUNCTION(RegisterTypeMetadataRecords,
 // void swift_beginAccess(void *pointer, ValueBuffer *scratch, size_t flags);
 FUNCTION(BeginAccess, Swift, swift_beginAccess, C_CC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(Int8PtrTy, getFixedBufferTy()->getPointerTo(), SizeTy, Int8PtrTy),
+         ARGS(Int8PtrTy, PtrTy, SizeTy, Int8PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::ExclusivityChecking),
         UNKNOWN_MEMEFFECTS)
@@ -1944,7 +1904,7 @@ FUNCTION(BeginAccess, Swift, swift_beginAccess, C_CC, AlwaysAvailable,
 // void swift_endAccess(ValueBuffer *scratch);
 FUNCTION(EndAccess, Swift, swift_endAccess, C_CC, AlwaysAvailable,
         RETURNS(VoidTy),
-         ARGS(getFixedBufferTy()->getPointerTo()),
+         ARGS(PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::ExclusivityChecking),
         UNKNOWN_MEMEFFECTS)
@@ -1952,7 +1912,7 @@ FUNCTION(EndAccess, Swift, swift_endAccess, C_CC, AlwaysAvailable,
 FUNCTION(GetOrigOfReplaceable, Swift, swift_getOrigOfReplaceable, C_CC,
         DynamicReplacementAvailability,
         RETURNS(FunctionPtrTy),
-         ARGS(FunctionPtrTy->getPointerTo()),
+         ARGS(PtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::NoEffect),
         UNKNOWN_MEMEFFECTS)
@@ -1960,7 +1920,7 @@ FUNCTION(GetOrigOfReplaceable, Swift, swift_getOrigOfReplaceable, C_CC,
 FUNCTION(GetReplacement, Swift, swift_getFunctionReplacement, C_CC,
         DynamicReplacementAvailability,
         RETURNS(FunctionPtrTy),
-         ARGS(FunctionPtrTy->getPointerTo(), FunctionPtrTy),
+         ARGS(PtrTy, FunctionPtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::NoEffect),
         UNKNOWN_MEMEFFECTS)
@@ -2240,14 +2200,14 @@ FUNCTION(VerifyTypeLayoutAttribute, Swift, _swift_debug_verifyTypeLayoutAttribut
 // float swift_intToFloat32(const size_t *data, IntegerLiteralFlags flags);
 FUNCTION(IntToFloat32, Swift, swift_intToFloat32, SwiftCC, AlwaysAvailable,
         RETURNS(FloatTy),
-         ARGS(SizeTy->getPointerTo(), SizeTy),
+         ARGS(PtrTy, SizeTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::NoEffect),
         MEMEFFECTS(ReadOnly))

 FUNCTION(IntToFloat64, Swift, swift_intToFloat64, SwiftCC, AlwaysAvailable,
         RETURNS(DoubleTy),
-         ARGS(SizeTy->getPointerTo(), SizeTy),
+         ARGS(PtrTy, SizeTy),
         ATTRS(NoUnwind, WillReturn),
         EFFECT(RuntimeEffect::NoEffect),
         MEMEFFECTS(ReadOnly))
@@ -2783,9 +2743,7 @@ FUNCTION(GenericInitializeBufferWithCopyOfBuffer,
         Swift, swift_cvw_initializeBufferWithCopyOfBuffer,
         C_CC, AlwaysAvailable,
         RETURNS(Int8PtrTy),
-         ARGS(getFixedBufferTy()->getPointerTo(),
-              getFixedBufferTy()->getPointerTo(),
-              TypeMetadataPtrTy),
+         ARGS(PtrTy, PtrTy, TypeMetadataPtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::RefCounting),
         UNKNOWN_MEMEFFECTS)
@@ -2845,9 +2803,7 @@ FUNCTION(GenericInitializeBufferWithCopyOfBufferMultiPayloadEnumFN,
         Swift, swift_cvw_initializeBufferWithCopyOfBufferMultiPayloadEnumFN,
         C_CC, AlwaysAvailable,
         RETURNS(Int8PtrTy),
-         ARGS(getFixedBufferTy()->getPointerTo(),
-              getFixedBufferTy()->getPointerTo(),
-              TypeMetadataPtrTy),
+         ARGS(PtrTy, PtrTy, TypeMetadataPtrTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::RefCounting),
         UNKNOWN_MEMEFFECTS)
@@ -2974,7 +2930,7 @@ FUNCTION(InitRawStructMetadata,
         Swift, swift_initRawStructMetadata,
         C_CC, InitRawStructMetadataAvailability,
         RETURNS(VoidTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, Int8PtrPtrTy->getPointerTo(0), Int32Ty),
+         ARGS(TypeMetadataPtrTy, SizeTy, PtrTy, Int32Ty),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),
         UNKNOWN_MEMEFFECTS)
@@ -2988,7 +2944,7 @@ FUNCTION(InitRawStructMetadata2,
         Swift, swift_initRawStructMetadata2,
         C_CC, InitRawStructMetadata2Availability,
         RETURNS(VoidTy),
-         ARGS(TypeMetadataPtrTy, SizeTy, Int8PtrPtrTy->getPointerTo(0), SizeTy,
+         ARGS(TypeMetadataPtrTy, SizeTy, PtrTy, SizeTy,
              SizeTy),
         ATTRS(NoUnwind),
         EFFECT(RuntimeEffect::MetaData),