diff options
| author | Haochen Gui <guihaoc@gcc.gnu.org> | 2023-03-24 10:45:52 +0800 |
|---|---|---|
| committer | Haochen Gui <guihaoc@gcc.gnu.org> | 2023-03-24 10:47:13 +0800 |
| commit | 3b67db31236631432e7f6d74ed49af9ae2183a4d (patch) | |
| tree | 8bce8ec5e48fcd55fa984121d1b690206356e297 /gcc/fortran/target-memory.cc | |
| parent | 08ef17c75777ef9e4e7ead132ccd7a6d03ae6020 (diff) | |
| download | gcc-3b67db31236631432e7f6d74ed49af9ae2183a4d.zip gcc-3b67db31236631432e7f6d74ed49af9ae2183a4d.tar.gz gcc-3b67db31236631432e7f6d74ed49af9ae2183a4d.tar.bz2 | |
Fortran: Escalate failure when Hollerith constant to real conversion fails
gcc/fortran/
PR target/103628
* target-memory.cc (gfc_interpret_float): Return FAIL when
native_interpret_expr gets a NULL tree.
* arith.cc (gfc_hollerith2real): Return NULL when
gfc_interpret_float fails.
* error.cc (gfc_buffered_p): Define.
* gfortran.h (gfc_buffered_p): Declare.
* intrinsic.cc: Add diagnostic.h to include list.
(do_simplify): Save errorcount and check it at finish. Report a
"Cannot simplify expression" error on a bad result if error count
doesn't change and no other errors buffered.
gcc/testsuite/
PR target/103628
* gfortran.dg/assumed_size_refs_2.f90: Check "Cannot simplify
expression" error.
* gfortran.dg/unpack_field_1.f90: Likewise.
* gfortran.dg/pr103628.f90: New.
Co-Authored-By: Tobias Burnus <tobias@codesourcery.com>
Diffstat (limited to 'gcc/fortran/target-memory.cc')
| -rw-r--r-- | gcc/fortran/target-memory.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/fortran/target-memory.cc b/gcc/fortran/target-memory.cc index 05b8255..edc30bd 100644 --- a/gcc/fortran/target-memory.cc +++ b/gcc/fortran/target-memory.cc @@ -416,11 +416,14 @@ gfc_interpret_float (int kind, unsigned char *buffer, size_t buffer_size, mpfr_t real) { gfc_set_model_kind (kind); - mpfr_init (real); - gfc_conv_tree_to_mpfr (real, - native_interpret_expr (gfc_get_real_type (kind), - buffer, buffer_size)); + tree source = native_interpret_expr (gfc_get_real_type (kind), buffer, + buffer_size); + if (!source) + return 0; + + mpfr_init (real); + gfc_conv_tree_to_mpfr (real, source); return size_float (kind); } |