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

AST: Check subject type in ProtocolConformanceRef::forAbstract()

Browse Source
This commit is contained in:
Slava Pestov
2025-03-26 11:07:10 -04:00
parent 4289b98f9b
commit cc05e1e79a
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/AST/ProtocolConformanceRef.cpp
View File

@@ -312,10 +312,8 @@ bool ProtocolConformanceRef::isCanonical() const {
if (isPack())
return getPack()->isCanonical();
if (isAbstract()) {
Type conformingType = getType();
return !conformingType || conformingType->isCanonical();
}
if (isAbstract())
return getType()->isCanonical();
return getConcrete()->isCanonical();
}
@@ -328,12 +326,8 @@ ProtocolConformanceRef::getCanonicalConformanceRef() const {
if (isPack())
return ProtocolConformanceRef(getPack()->getCanonicalConformance());
if (isAbstract()) {
Type conformingType = getType();
if (conformingType)
conformingType = conformingType->getCanonicalType();
return forAbstract(conformingType, getProtocol());
}
if (isAbstract())
return forAbstract(getType()->getCanonicalType(), getProtocol());
return ProtocolConformanceRef(getConcrete()->getCanonicalConformance());
}