Skip to content

[Sema] Fix crash in CheckRedeclarationRequest for IUO mismatch check #85115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2025
+40 −58
Merged

[Sema] Fix crash in CheckRedeclarationRequest for IUO mismatch check #85115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 30 additions & 58 deletions lib/Sema/TypeCheckDeclPrimary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,65 +873,37 @@ CheckRedeclarationRequest::evaluate(Evaluator &eval, ValueDecl *current,
continue;
}

// Signatures are the same, but interface types are not. We must
// have a type that we've massaged as part of signature
// interface type generation.
if (current->getInterfaceType()->isEqual(other->getInterfaceType())) {
if (currentDC->isTypeContext() == other->getDeclContext()->isTypeContext()) {
auto currFnTy = current->getInterfaceType()->getAs<AnyFunctionType>();
auto otherFnTy = other->getInterfaceType()->getAs<AnyFunctionType>();
if (currFnTy && otherFnTy && currentDC->isTypeContext()) {
currFnTy = currFnTy->getResult()->getAs<AnyFunctionType>();
otherFnTy = otherFnTy->getResult()->getAs<AnyFunctionType>();
}

if (currFnTy && otherFnTy) {
ArrayRef<AnyFunctionType::Param> currParams = currFnTy->getParams();
ArrayRef<AnyFunctionType::Param> otherParams = otherFnTy->getParams();

if (currParams.size() == otherParams.size()) {
auto diagnosed = false;
for (unsigned i : indices(currParams)) {

bool currIsIUO = false;
bool otherIsIUO = false;
bool optionalRedecl = false;

if (currParams[i].getPlainType()->getOptionalObjectType()) {
optionalRedecl = true;
auto *param = swift::getParameterAt(current, i);
assert(param);
if (param->isImplicitlyUnwrappedOptional())
currIsIUO = true;
}

if (otherParams[i].getPlainType()->getOptionalObjectType()) {
auto *param = swift::getParameterAt(other, i);
assert(param);
if (param->isImplicitlyUnwrappedOptional())
otherIsIUO = true;
}
else {
optionalRedecl = false;
}

if (optionalRedecl && currIsIUO != otherIsIUO) {
ctx.Diags.diagnoseWithNotes(
current->diagnose(diag::invalid_redecl, current), [&]() {
other->diagnose(diag::invalid_redecl_prev, other);
});
current->diagnose(diag::invalid_redecl_by_optionality_note,
otherIsIUO, currIsIUO);

current->setInvalid();
diagnosed = true;
break;
}
}

if (diagnosed)
break;
// Emit a custom diagnostic if the interface types match but one of the
// parameters differ in IUO-ness.
if (current->getInterfaceType()->isEqual(other->getInterfaceType()) &&
currentDC->isTypeContext() == otherDC->isTypeContext()) {
auto currParams = current->getParameterList();
auto otherParams = other->getParameterList();

if (currParams && otherParams &&
currParams->size() == otherParams->size()) {
for (unsigned i : indices(*currParams)) {
auto *currParam = currParams->get(i);
auto *otherParam = otherParams->get(i);

if (!currParam->getInterfaceType()->isOptional() ||
!otherParam->getInterfaceType()->isOptional()) {
continue;
}

auto currIsIUO = currParam->isImplicitlyUnwrappedOptional();
auto otherIsIUO = otherParam->isImplicitlyUnwrappedOptional();
if (currIsIUO == otherIsIUO)
continue;

ctx.Diags.diagnoseWithNotes(
current->diagnose(diag::invalid_redecl, current),
[&]() { other->diagnose(diag::invalid_redecl_prev, other); });
current->diagnose(diag::invalid_redecl_by_optionality_note,
otherIsIUO, currIsIUO);

current->setInvalid();
return std::make_tuple();
}
}
}
Expand Down
10 changes: 10 additions & 0 deletions test/decl/overload.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,16 @@ class optionalOverloads {
func optional_3() -> Int? { } // expected-note{{previously declared}}
func optional_3() -> Int! { } // expected-error{{invalid redeclaration of 'optional_3()'}}

var optionalFnVar: (Int?) -> Void // expected-note {{previously declared}}
var optionalFnVar: (Int?) -> Void // expected-error {{invalid redeclaration of 'optionalFnVar'}}

enum IUORedeclarationCaseConstructor {
case foo(Int?) // expected-note{{previously declared}}
static func foo(_ x: Int!) -> Self {}
// expected-error@-1 {{invalid redeclaration of 'foo'}}
// expected-note@-2 {{implicitly unwrapped optional parameter is of same type as optional parameter}}
}

// mutating / nonmutating
protocol ProtocolWithMutating {
mutating func test1() // expected-note {{previously declared}}
Expand Down