averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71371 from slavapestov/ncgenerics-fixes-3

Browse Source 
Non-copyable generics fixes, part 3
This commit is contained in:
Slava Pestov
2024-02-06 08:35:07 -05:00
committed by GitHub
parent 5acd366c98 9f0bf00c3f
commit d46bd335de
47 changed files with 432 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/Sema/CSSimplify.cpp
View File

@@ -3889,19 +3889,21 @@ ConstraintSystem::matchExistentialTypes(Type type1, Type type2,
return getTypeMatchAmbiguous();
}
// move-only types (and their metatypes) cannot match with existential types.
if (type1->getMetatypeInstanceType()->isNoncopyable()) {
// tailor error message
if (shouldAttemptFixes()) {
auto *fix = MustBeCopyable::create(*this,
type1,
NoncopyableMatchFailure::forExistentialCast(
type2),
getConstraintLocator(locator));
if (!recordFix(fix))
return getTypeMatchSuccess();
if (!SWIFT_ENABLE_EXPERIMENTAL_NONCOPYABLE_GENERICS) {
// move-only types (and their metatypes) cannot match with existential types.
if (type1->getMetatypeInstanceType()->isNoncopyable()) {
// tailor error message
if (shouldAttemptFixes()) {
auto *fix = MustBeCopyable::create(*this,
type1,
NoncopyableMatchFailure::forExistentialCast(
type2),
getConstraintLocator(locator));
if (!recordFix(fix))
return getTypeMatchSuccess();
}
return getTypeMatchFailure(locator);
}
return getTypeMatchFailure(locator);
}
// FIXME: Feels like a hack.