Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 10 additions & 9 deletions flang/lib/Evaluate/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,26 @@ namespace Fortran::evaluate {
void FoldingContext::RealFlagWarnings(
const RealFlags &flags, const char *operation) {
static constexpr auto warning{common::UsageWarning::FoldingException};
if (!realFlagWarningContext_.empty()) {
// Override 'operation' with a string like
// "compilation-time evaluation of a call to '...'"
operation = realFlagWarningContext_.c_str();
}
if (flags.test(RealFlag::Overflow)) {
Warn(warning, "overflow on %s%s"_warn_en_US, operation,
realFlagWarningContext_);
Warn(warning, "overflow on %s"_warn_en_US, operation);
}
if (flags.test(RealFlag::DivideByZero)) {
if (std::strcmp(operation, "division") == 0) {
Warn(warning, "division by zero%s"_warn_en_US, realFlagWarningContext_);
Warn(warning, "division by zero"_warn_en_US);
} else {
Warn(warning, "division by zero on %s%s"_warn_en_US, operation,
realFlagWarningContext_);
Warn(warning, "division by zero on %s"_warn_en_US, operation);
}
}
if (flags.test(RealFlag::InvalidArgument)) {
Warn(warning, "invalid argument on %s%s"_warn_en_US, operation,
realFlagWarningContext_);
Warn(warning, "invalid argument on %s"_warn_en_US, operation);
}
if (flags.test(RealFlag::Underflow)) {
Warn(warning, "underflow on %s%s"_warn_en_US, operation,
realFlagWarningContext_);
Warn(warning, "underflow on %s"_warn_en_US, operation);
}
}

Expand Down
2 changes: 1 addition & 1 deletion flang/lib/Evaluate/intrinsics-library.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ std::optional<HostRuntimeWrapper> GetHostRuntimeWrapper(const std::string &name,
.value());
}
auto restorer{context.SetRealFlagWarningContext(
" after folding a call to '"s + name + "'"s)};
"compilation-time evaluation of a call to '"s + name + "'"s)};
return Fold(context,
ConvertToType(
resultType, hostFolderWithChecks(context, std::move(args)))
Expand Down
2 changes: 1 addition & 1 deletion flang/test/Evaluate/folding33.f90
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!RUN: %flang_fc1 -fsyntax-only %s 2>&1 | FileCheck %s
!CHECK: warning: overflow on REAL(4) to REAL(2) conversion after folding a call to 'exp' [-Wfolding-exception]
!CHECK: warning: overflow on compilation-time evaluation of a call to 'exp' [-Wfolding-exception]
print *, exp((11.265625_2,1._2))
end