diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2021-12-20 22:59:53 +0100 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gmx.de> | 2022-01-09 22:18:11 +0100 |
| commit | 49d73c9fb644673323845efebfe6b3106e70af8a (patch) | |
| tree | e0188524e8e74c1be47e96d451ef4db572650345 | |
| parent | 2e63128306ff93d8f53119137dd6c28b2defac94 (diff) | |
| download | gcc-49d73c9fb644673323845efebfe6b3106e70af8a.zip gcc-49d73c9fb644673323845efebfe6b3106e70af8a.tar.gz gcc-49d73c9fb644673323845efebfe6b3106e70af8a.tar.bz2 | |
Fortran: check arguments of MASKL/MASKR intrinsics before simplification
gcc/fortran/ChangeLog:
PR fortran/103777
* simplify.c (gfc_simplify_maskr): Check validity of argument 'I'
before simplifying.
(gfc_simplify_maskl): Likewise.
gcc/testsuite/ChangeLog:
PR fortran/103777
* gfortran.dg/masklr_3.f90: New test.
| -rw-r--r-- | gcc/fortran/simplify.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/masklr_3.f90 | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index ded0745..cc7d33a 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -4878,6 +4878,9 @@ gfc_simplify_maskr (gfc_expr *i, gfc_expr *kind_arg) bool fail = gfc_extract_int (i, &arg); gcc_assert (!fail); + if (!gfc_check_mask (i, kind_arg)) + return &gfc_bad_expr; + result = gfc_get_constant_expr (BT_INTEGER, kind, &i->where); /* MASKR(n) = 2^n - 1 */ @@ -4909,6 +4912,9 @@ gfc_simplify_maskl (gfc_expr *i, gfc_expr *kind_arg) bool fail = gfc_extract_int (i, &arg); gcc_assert (!fail); + if (!gfc_check_mask (i, kind_arg)) + return &gfc_bad_expr; + result = gfc_get_constant_expr (BT_INTEGER, kind, &i->where); /* MASKL(n) = 2^bit_size - 2^(bit_size - n) */ diff --git a/gcc/testsuite/gfortran.dg/masklr_3.f90 b/gcc/testsuite/gfortran.dg/masklr_3.f90 new file mode 100644 index 0000000..eb689f0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/masklr_3.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! PR fortran/103777 - ICE in gfc_simplify_maskl +! Contributed by G.Steinmetz + +program p + print *, maskl([999]) ! { dg-error "must be less than or equal" } + print *, maskr([999]) ! { dg-error "must be less than or equal" } + print *, maskl([-999]) ! { dg-error "must be nonnegative" } + print *, maskr([-999]) ! { dg-error "must be nonnegative" } + print *, maskl([32],kind=4) + print *, maskl([33],kind=4) ! { dg-error "must be less than or equal" } + print *, maskl([64],kind=8) + print *, maskl([65],kind=8) ! { dg-error "must be less than or equal" } +end |