@@ -4688,8 +4688,9 @@ swift_getAssociatedTypeWitnessSlowImpl(
4688
4688
#endif
4689
4689
4690
4690
// If the low bit of the witness is clear, it's already a metadata pointer.
4691
- if (LLVM_LIKELY ((uintptr_t (witness) &
4692
- ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0 )) {
4691
+ if (SWIFT_LIKELY ((reinterpret_cast <uintptr_t >(witness) &
4692
+ ProtocolRequirementFlags::AssociatedTypeMangledNameBit) ==
4693
+ 0 )) {
4693
4694
// Cached metadata pointers are always complete.
4694
4695
return MetadataResponse{(const Metadata *)witness, MetadataState::Complete};
4695
4696
}
@@ -4809,8 +4810,9 @@ swift::swift_getAssociatedTypeWitness(MetadataRequest request,
4809
4810
extraDiscriminator));
4810
4811
#endif
4811
4812
4812
- if (LLVM_LIKELY ((uintptr_t (witness) &
4813
- ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0 )) {
4813
+ if (SWIFT_LIKELY ((reinterpret_cast <uintptr_t >(witness) &
4814
+ ProtocolRequirementFlags::AssociatedTypeMangledNameBit) ==
4815
+ 0 )) {
4814
4816
// Cached metadata pointers are always complete.
4815
4817
return MetadataResponse{(const Metadata *)witness, MetadataState::Complete};
4816
4818
}
@@ -4861,8 +4863,9 @@ static const WitnessTable *swift_getAssociatedConformanceWitnessSlowImpl(
4861
4863
#endif
4862
4864
4863
4865
// Fast path: we've already resolved this to a witness table, so return it.
4864
- if (LLVM_LIKELY ((uintptr_t (witness) &
4865
- ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0 )) {
4866
+ if (SWIFT_LIKELY ((reinterpret_cast <uintptr_t >(witness) &
4867
+ ProtocolRequirementFlags::AssociatedTypeMangledNameBit) ==
4868
+ 0 )) {
4866
4869
return static_cast <const WitnessTable *>(witness);
4867
4870
}
4868
4871
@@ -4937,8 +4940,9 @@ const WitnessTable *swift::swift_getAssociatedConformanceWitness(
4937
4940
#endif
4938
4941
4939
4942
// Fast path: we've already resolved this to a witness table, so return it.
4940
- if (LLVM_LIKELY ((uintptr_t (witness) &
4941
- ProtocolRequirementFlags::AssociatedTypeMangledNameBit) == 0 )) {
4943
+ if (SWIFT_LIKELY ((reinterpret_cast <uintptr_t >(witness) &
4944
+ ProtocolRequirementFlags::AssociatedTypeMangledNameBit) ==
4945
+ 0 )) {
4942
4946
return static_cast <const WitnessTable *>(witness);
4943
4947
}
4944
4948
0 commit comments