[flang-commits] [PATCH] D123714: [flang] Raise FP exceptions from runtime conversion to binary
Peter Klausler via Phabricator via flang-commits
flang-commits at lists.llvm.org
Wed Apr 13 12:43:03 PDT 2022
klausler created this revision.
klausler added a reviewer: jeanPerier.
klausler added a project: Flang.
Herald added a subscriber: jdoerfert.
Herald added a project: All.
klausler requested review of this revision.
Formatted READs of REAL should convert the exception flags from
the decimal-to-binary conversion library into real runtime FP
exceptions so that they at least show up in the termination message
of a STOP statement.
https://reviews.llvm.org/D123714
Files:
flang/runtime/edit-input.cpp
Index: flang/runtime/edit-input.cpp
===================================================================
--- flang/runtime/edit-input.cpp
+++ flang/runtime/edit-input.cpp
@@ -12,6 +12,7 @@
#include "flang/Common/real.h"
#include "flang/Common/uint128.h"
#include <algorithm>
+#include <cfenv>
namespace Fortran::runtime::io {
@@ -276,6 +277,25 @@
return got;
}
+static void RaiseFPExceptions(decimal::ConversionResultFlags flags) {
+#undef RAISE
+#ifdef feraisexcept // a macro in some environments; omit std::
+#define RAISE feraiseexcept
+#else
+#define RAISE std::feraiseexcept
+#endif
+ if (flags & decimal::ConversionResultFlags::Overflow) {
+ RAISE(FE_OVERFLOW);
+ }
+ if (flags & decimal::ConversionResultFlags::Inexact) {
+ RAISE(FE_INEXACT);
+ }
+ if (flags & decimal::ConversionResultFlags::Invalid) {
+ RAISE(FE_INVALID);
+ }
+#undef RAISE
+}
+
// If no special modes are in effect and the form of the input value
// that's present in the input stream is acceptable to the decimal->binary
// converter without modification, this fast path for real input
@@ -324,10 +344,13 @@
return false; // unconverted characters remain in fixed width field
}
// Success on the fast path!
- // TODO: raise converted.flags as exceptions?
*reinterpret_cast<decimal::BinaryFloatingPointNumber<PRECISION> *>(n) =
converted.binary;
io.HandleRelativePosition(p - str);
+ // Set FP exception flags
+ if (converted.flags != decimal::ConversionResultFlags::Exact) {
+ RaiseFPExceptions(converted.flags);
+ }
return true;
}
@@ -395,9 +418,12 @@
converted.flags = static_cast<enum decimal::ConversionResultFlags>(
converted.flags | decimal::Inexact);
}
- // TODO: raise converted.flags as exceptions?
*reinterpret_cast<decimal::BinaryFloatingPointNumber<binaryPrecision> *>(n) =
converted.binary;
+ // Set FP exception flags
+ if (converted.flags != decimal::ConversionResultFlags::Exact) {
+ RaiseFPExceptions(converted.flags);
+ }
return true;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D123714.422605.patch
Type: text/x-patch
Size: 2042 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/flang-commits/attachments/20220413/b3385472/attachment.bin>
More information about the flang-commits
mailing list