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 #78309 from AnthonyLatsis/nymphaea

Browse Source 
Assortment of small fixes and cleanups
This commit is contained in:
Anthony Latsis
2024-12-20 06:51:19 +00:00
committed by GitHub
parent e6b9cb986f 967f99ff22
commit cd1ef24c49
13 changed files with 71 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Sema/CSSimplify.cpp
View File

@@ -1441,8 +1441,8 @@ public:
}
};
static std::optional<std::tuple<GenericTypeParamType *, TypeVariableType *,
Type, OpenedExistentialAdjustments>>
static std::optional<
std::tuple<TypeVariableType *, Type, OpenedExistentialAdjustments>>
shouldOpenExistentialCallArgument(ValueDecl *callee, unsigned paramIdx,
Type paramTy, Type argTy, Expr *argExpr,
ConstraintSystem &cs) {
@@ -1819,12 +1819,10 @@ static ConstraintSystem::TypeMatchResult matchCallArguments(
if (auto existentialArg = shouldOpenExistentialCallArgument(
callee, paramIdx, paramTy, argTy, argExpr, cs)) {
// My kingdom for a decent "if let" in C++.
GenericTypeParamType *openedGenericParam;
TypeVariableType *openedTypeVar;
Type existentialType;
OpenedExistentialAdjustments adjustments;
std::tie(openedGenericParam, openedTypeVar, existentialType,
adjustments) = *existentialArg;
std::tie(openedTypeVar, existentialType, adjustments) = *existentialArg;
OpenedArchetypeType *opened;
std::tie(argTy, opened) = cs.openExistentialType(