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

[CSSimplify] Make sure that Swift -> C pointer conversion always waits for optionals

Browse Source 
Wait for a value-to-optional promotion or optional-to-optional conversion
to happen before attempting Swift -> C pointer conversion.
This commit is contained in:
Pavel Yaskevich
2021-08-19 13:41:33 -07:00
parent de35114171
commit 25762c25ee
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Sema/ConstraintSystem.cpp
View File

@@ -5001,11 +5001,29 @@ bool constraints::isArgumentOfReferenceEqualityOperator(
bool ConstraintSystem::isArgumentOfImportedDecl(
ConstraintLocatorBuilder locator) {
auto last = locator.last();
if (!(last && last->is<LocatorPathElt::ApplyArgToParam>()))
SmallVector<LocatorPathElt, 4> path;
auto anchor = locator.getLocatorParts(path);
if (path.empty())
return false;
auto *application = getCalleeLocator(getConstraintLocator(locator));
while (!path.empty()) {
const auto &last = path.back();
// Drop all of the `optional payload` or `generic argument`
// locator elements at the end of the path, they came from
// either value-to-optional promotion or optional-to-optional
// conversion.
if (last.is<LocatorPathElt::OptionalPayload>() ||
last.is<LocatorPathElt::GenericArgument>()) {
path.pop_back();
continue;
}
break;
}
auto *application = getCalleeLocator(getConstraintLocator(anchor, path));
auto overload = findSelectedOverloadFor(application);
if (!(overload && overload->choice.isDecl()))