Skip to content

Commit

Permalink
[flang] Avoid crash in error recovery
Browse files Browse the repository at this point in the history
When a PASS() clause names a nonexistent dummy argument, don't crash
later in expression semantics.
Fixes #63487.

Differential Revision: https://reviews.llvm.org/D153792
  • Loading branch information
klausler committed Jun 27, 2023
1 parent 1c900ed commit 9fdde69
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
13 changes: 8 additions & 5 deletions flang/lib/Semantics/expression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2116,7 +2116,7 @@ static std::optional<parser::CharBlock> GetPassName(
proc.details());
}

static int GetPassIndex(const Symbol &proc) {
static std::optional<int> GetPassIndex(const Symbol &proc) {
CHECK(!proc.attrs().test(semantics::Attr::NOPASS));
std::optional<parser::CharBlock> passName{GetPassName(proc)};
const auto *interface {
Expand All @@ -2133,7 +2133,7 @@ static int GetPassIndex(const Symbol &proc) {
}
++index;
}
DIE("PASS argument name not in dummy argument list");
return std::nullopt;
}

// Injects an expression into an actual argument list as the "passed object"
Expand All @@ -2146,10 +2146,13 @@ static void AddPassArg(ActualArguments &actuals, const Expr<SomeDerived> &expr,
if (component.attrs().test(semantics::Attr::NOPASS)) {
return;
}
int passIndex{GetPassIndex(component)};
std::optional<int> passIndex{GetPassIndex(component)};
if (!passIndex) {
return; // error recovery
}
auto iter{actuals.begin()};
int at{0};
while (iter < actuals.end() && at < passIndex) {
while (iter < actuals.end() && at < *passIndex) {
if (*iter && (*iter)->keyword()) {
iter = actuals.end();
break;
Expand Down Expand Up @@ -4296,7 +4299,7 @@ const Symbol *ArgumentAnalyzer::FindBoundOp(parser::CharBlock oprName,
if (generic) {
ExpressionAnalyzer::AdjustActuals adjustment{
[&](const Symbol &proc, ActualArguments &) {
return passIndex == GetPassIndex(proc);
return passIndex == GetPassIndex(proc).value_or(-1);
}};
auto pair{
context_.ResolveGeneric(*generic, actuals_, adjustment, isSubroutine)};
Expand Down
5 changes: 5 additions & 0 deletions flang/test/Semantics/resolve52.f90
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ module m3
subroutine s(x)
class(t) :: x
end
subroutine test
type(t) x
!ERROR: Dummy argument 'x=' (#1) is not OPTIONAL and is not associated with an actual argument in this procedure reference
call x%p
end
end

module m4
Expand Down

0 comments on commit 9fdde69

Please sign in to comment.