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

Merge pull request #71253 from DougGregor/hash-table-iteration-considered-harmful

Browse Source 
Fix nondeterminism in explicitly-specified generic macro arguments
This commit is contained in:
Doug Gregor
2024-01-30 15:21:40 -08:00
committed by GitHub
parent 1e9af2404f 7712903f6b
commit 29cfe61472
2 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/Sema/CSSimplify.cpp
View File

@@ -13703,6 +13703,25 @@ ConstraintSystem::simplifyExplicitGenericArgumentsConstraint(
if (simplifiedBoundType->isTypeVariableOrMember())
return formUnsolved();
std::function<GenericParamList *(ValueDecl *)> getGenericParams =
[&](ValueDecl *decl) -> GenericParamList * {
auto genericContext = decl->getAsGenericContext();
if (!genericContext)
return nullptr;
auto genericParams = genericContext->getGenericParams();
if (!genericParams) {
// If declaration is a non-generic typealias, let's point
// to the underlying generic declaration.
if (auto *TA = dyn_cast<TypeAliasDecl>(decl)) {
if (auto *UGT = TA->getUnderlyingType()->getAs<AnyGenericType>())
return getGenericParams(UGT->getDecl());
}
}
return genericParams;
};
ValueDecl *decl;
SmallVector<OpenedType, 2> openedTypes;
if (auto *bound = dyn_cast<TypeAliasType>(type1.getPointer())) {
@@ -13759,27 +13778,19 @@ ConstraintSystem::simplifyExplicitGenericArgumentsConstraint(
decl = overloadChoice.getDecl();
auto openedOverloadTypes = getOpenedTypes(overloadLocator);
openedTypes.append(openedOverloadTypes.begin(), openedOverloadTypes.end());
}
std::function<GenericParamList *(ValueDecl *)> getGenericParams =
[&](ValueDecl *decl) -> GenericParamList * {
auto genericContext = decl->getAsGenericContext();
if (!genericContext)
return nullptr;
auto genericParams = genericContext->getGenericParams();
if (!genericParams) {
// If declaration is a non-generic typealias, let's point
// to the underlying generic declaration.
if (auto *TA = dyn_cast<TypeAliasDecl>(decl)) {
if (auto *UGT = TA->getUnderlyingType()->getAs<AnyGenericType>())
return getGenericParams(UGT->getDecl());
auto genericParams = getGenericParams(decl);
if (genericParams) {
for (auto gp : *genericParams) {
auto found = find_if(openedOverloadTypes, [&](auto entry) {
return entry.first->getDepth() == gp->getDepth() &&
entry.first->getIndex() == gp->getIndex();
});
assert(found != openedOverloadTypes.end());
openedTypes.push_back(*found);
}
}
return genericParams;
};
}
if (!decl->getAsGenericContext())
return SolutionKind::Error;