Skip to content

Commit

Permalink
[flang] Diagnose ridiculously large kind parameters
Browse files Browse the repository at this point in the history
Kind parameters on literals (1_4, 1.0_8, 4_"Unicode") are not
being caught as errors if they're extremely large integer values
that become valid when truncated to C++'s int type.

Differential Revision: https://reviews.llvm.org/D145747
  • Loading branch information
klausler committed Mar 10, 2023
1 parent 199402c commit 085c197
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
23 changes: 12 additions & 11 deletions flang/lib/Semantics/expression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -596,23 +596,24 @@ int ExpressionAnalyzer::AnalyzeKindParam(
if (!kindParam) {
return defaultKind;
}
return common::visit(
std::int64_t kind{common::visit(
common::visitors{
[](std::uint64_t k) { return static_cast<int>(k); },
[](std::uint64_t k) { return static_cast<std::int64_t>(k); },
[&](const parser::Scalar<
parser::Integer<parser::Constant<parser::Name>>> &n) {
if (MaybeExpr ie{Analyze(n)}) {
if (std::optional<std::int64_t> i64{ToInt64(*ie)}) {
int iv = *i64;
if (iv == *i64) {
return iv;
}
}
return ToInt64(*ie).value_or(defaultKind);
}
return defaultKind;
return static_cast<std::int64_t>(defaultKind);
},
},
kindParam->u);
kindParam->u)};
if (kind != static_cast<int>(kind)) {
Say("Unsupported type kind value (%jd)"_err_en_US,
static_cast<std::intmax_t>(kind));
kind = defaultKind;
}
return static_cast<int>(kind);
}

// Common handling of parser::IntLiteralConstant and SignedIntLiteralConstant
Expand Down Expand Up @@ -657,7 +658,7 @@ struct IntTypeVisitor {
}
ExpressionAnalyzer &analyzer;
parser::CharBlock digits;
int kind;
std::int64_t kind;
bool isDefaultKind;
bool isNegated;
};
Expand Down
2 changes: 2 additions & 0 deletions flang/test/Semantics/kinds02.f90
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@
character(len=*), parameter :: cvar10 = 4_"abcd"
!ERROR: CHARACTER(KIND=8) is not a supported type
character(len=*), parameter :: cvar11 = 8_"abcd"
!ERROR: Unsupported type kind value (5000000000)
print *, 123_5000000000
end program

subroutine s(a, b)
Expand Down

0 comments on commit 085c197

Please sign in to comment.