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

[Sema] Don't suggest fixits that try to force unwrap implicit $match

Browse Source 
Check if a variable is actually spelled out in code before suggesting a
fixit that adds a force unwrap to it

This fixes SR-1827
This commit is contained in:
Alex Hoppen
2016-07-11 15:06:32 +02:00
parent f96083c840
commit fc4216e94b
4 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Sema/CSSimplify.cpp
View File

@@ -2009,7 +2009,20 @@ commit_to_conversions:
// If we have an optional type, try to force-unwrap it.
// FIXME: Should we also try '?'?
if (objectType1->getOptionalObjectType()) {
conversionsOrFixes.push_back(FixKind::ForceOptional);
bool forceUnwrapPossible = true;
if (auto declRefExpr =
dyn_cast_or_null<DeclRefExpr>(locator.trySimplifyToExpr())) {
if (declRefExpr->getDecl()->isImplicit()) {
// The expression that provides the first type is implicit and never
// spelled out in source code, e.g. $match in an expression pattern.
// Thus we cannot force unwrap the first type
forceUnwrapPossible = false;
}
}
if (forceUnwrapPossible) {
conversionsOrFixes.push_back(FixKind::ForceOptional);
}
}
// If we have a value of type AnyObject that we're trying to convert to