@@ -4682,8 +4682,9 @@ swift_getAssociatedTypeWitnessSlowImpl(
4682
4682
#endif
4683
4683
4684
4684
// If the low bit of the witness is clear, it's already a metadata pointer.
4685
- if (LLVM_LIKELY ((uintptr_t (witness) &
4686
- ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0 )) {
4685
+ if (SWIFT_LIKELY ((reinterpret_cast <uintptr_t >(witness) &
4686
+ ProtocolRequirementFlags::AssociatedTypeMangledNameBit) ==
4687
+ 0 )) {
4687
4688
// Cached metadata pointers are always complete.
4688
4689
return MetadataResponse{(const Metadata *)witness, MetadataState::Complete};
4689
4690
}
@@ -4803,8 +4804,9 @@ swift::swift_getAssociatedTypeWitness(MetadataRequest request,
4803
4804
extraDiscriminator));
4804
4805
#endif
4805
4806
4806
- if (LLVM_LIKELY ((uintptr_t (witness) &
4807
- ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0 )) {
4807
+ if (SWIFT_LIKELY ((reinterpret_cast <uintptr_t >(witness) &
4808
+ ProtocolRequirementFlags::AssociatedTypeMangledNameBit) ==
4809
+ 0 )) {
4808
4810
// Cached metadata pointers are always complete.
4809
4811
return MetadataResponse{(const Metadata *)witness, MetadataState::Complete};
4810
4812
}
@@ -4855,8 +4857,9 @@ static const WitnessTable *swift_getAssociatedConformanceWitnessSlowImpl(
4855
4857
#endif
4856
4858
4857
4859
// Fast path: we've already resolved this to a witness table, so return it.
4858
- if (LLVM_LIKELY ((uintptr_t (witness) &
4859
- ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0 )) {
4860
+ if (SWIFT_LIKELY ((reinterpret_cast <uintptr_t >(witness) &
4861
+ ProtocolRequirementFlags::AssociatedTypeMangledNameBit) ==
4862
+ 0 )) {
4860
4863
return static_cast <const WitnessTable *>(witness);
4861
4864
}
4862
4865
@@ -4931,8 +4934,9 @@ const WitnessTable *swift::swift_getAssociatedConformanceWitness(
4931
4934
#endif
4932
4935
4933
4936
// Fast path: we've already resolved this to a witness table, so return it.
4934
- if (LLVM_LIKELY ((uintptr_t (witness) &
4935
- ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0 )) {
4937
+ if (SWIFT_LIKELY ((reinterpret_cast <uintptr_t >(witness) &
4938
+ ProtocolRequirementFlags::AssociatedTypeMangledNameBit) ==
4939
+ 0 )) {
4936
4940
return static_cast <const WitnessTable *>(witness);
4937
4941
}
4938
4942
0 commit comments