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

[Sema] Account for value to optional restriction when recording runtime cast warnings

Browse Source
This commit is contained in:
LucianoAlmeida
2021-10-07 21:32:32 -03:00
parent 36d40b132f
commit 8c424383a6
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Sema/CSSimplify.cpp
View File

@@ -6709,7 +6709,10 @@ static bool isCastToExpressibleByNilLiteral(ConstraintSystem &cs, Type fromType,
static ConstraintFix *maybeWarnAboutExtraneousCast(
ConstraintSystem &cs, Type origFromType, Type origToType, Type fromType,
Type toType, SmallVector<Type, 4> fromOptionals,
SmallVector<Type, 4> toOptionals, ConstraintSystem::TypeMatchOptions flags,
SmallVector<Type, 4> toOptionals,
const std::vector<std::tuple<Type, Type, ConversionRestrictionKind>>
&constraintRestrictions,
ConstraintSystem::TypeMatchOptions flags,
ConstraintLocatorBuilder locator) {
auto last = locator.last();
@@ -6731,6 +6734,22 @@ static ConstraintFix *maybeWarnAboutExtraneousCast(
// "from" could be less optional than "to" e.g. `0 as Any?`, so
// we need to store the difference as a signed integer.
int extraOptionals = fromOptionals.size() - toOptionals.size();
// From expression could be a type variable with a value to optional
// restrictions that we have to account for optionality mismatch.
const auto subExprType = cs.getType(castExpr->getSubExpr());
if (llvm::any_of(constraintRestrictions, [&](auto &entry) {
Type type1, type2;
ConversionRestrictionKind kind;
std::tie(type1, type2, kind) = entry;
if (kind != ConversionRestrictionKind::ValueToOptional)
return false;
return fromType->isEqual(type1) && subExprType->isEqual(type2);
})) {
extraOptionals++;
origFromType = OptionalType::get(origFromType);
}
// Removing the optionality from to type when the force cast expr is an IUO.
const auto *const TR = castExpr->getCastTypeRepr();
if (isExpr<ForcedCheckedCastExpr>(anchor) && TR &&
@@ -6886,7 +6905,7 @@ ConstraintSystem::simplifyCheckedCastConstraint(
if (auto *fix = maybeWarnAboutExtraneousCast(
*this, origFromType, origToType, fromType, toType, fromOptionals,
toOptionals, flags, locator)) {
toOptionals, ConstraintRestrictions, flags, locator)) {
(void)recordFix(fix);
}
};
@@ -6954,7 +6973,7 @@ ConstraintSystem::simplifyCheckedCastConstraint(
// succeed or fail.
if (auto *fix = maybeWarnAboutExtraneousCast(
*this, origFromType, origToType, fromType, toType, fromOptionals,
toOptionals, flags, locator)) {
toOptionals, ConstraintRestrictions, flags, locator)) {
(void)recordFix(fix);
}