public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-9159] Fortran: fix order of checks for the SHAPE intrinsic
@ 2021-10-17 18:56 Harald Anlauf
0 siblings, 0 replies; only message in thread
From: Harald Anlauf @ 2021-10-17 18:56 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:d97dbf60dda22e0668dc33ca3a536adcb0963a65
commit r11-9159-gd97dbf60dda22e0668dc33ca3a536adcb0963a65
Author: Harald Anlauf <anlauf@gmx.de>
Date: Thu Oct 14 20:18:14 2021 +0200
Fortran: fix order of checks for the SHAPE intrinsic
gcc/fortran/ChangeLog:
PR fortran/102716
* check.c (gfc_check_shape): Reorder checks so that invalid KIND
arguments can be detected.
gcc/testsuite/ChangeLog:
PR fortran/102716
* gfortran.dg/shape_10.f90: New test.
(cherry picked from commit 1b115daf62d94337b3d0b2962b0bbbf005a450e0)
Diff:
---
gcc/fortran/check.c | 14 +++++++-------
gcc/testsuite/gfortran.dg/shape_10.f90 | 6 ++++++
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 851af1b30dc..06acb80e3ac 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -5082,6 +5082,13 @@ gfc_check_shape (gfc_expr *source, gfc_expr *kind)
if (gfc_invalid_null_arg (source))
return false;
+ if (!kind_check (kind, 1, BT_INTEGER))
+ return false;
+ if (kind && !gfc_notify_std (GFC_STD_F2003, "%qs intrinsic "
+ "with KIND argument at %L",
+ gfc_current_intrinsic, &kind->where))
+ return false;
+
if (source->rank == 0 || source->expr_type != EXPR_VARIABLE)
return true;
@@ -5094,13 +5101,6 @@ gfc_check_shape (gfc_expr *source, gfc_expr *kind)
return false;
}
- if (!kind_check (kind, 1, BT_INTEGER))
- return false;
- if (kind && !gfc_notify_std (GFC_STD_F2003, "%qs intrinsic "
- "with KIND argument at %L",
- gfc_current_intrinsic, &kind->where))
- return false;
-
return true;
}
diff --git a/gcc/testsuite/gfortran.dg/shape_10.f90 b/gcc/testsuite/gfortran.dg/shape_10.f90
new file mode 100644
index 00000000000..4943c21b1d2
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/shape_10.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! PR fortran/102716
+
+program p
+ integer, parameter :: a(1) = shape([2], [1]) ! { dg-error "must be a scalar" }
+end
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-10-17 18:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-17 18:56 [gcc r11-9159] Fortran: fix order of checks for the SHAPE intrinsic Harald Anlauf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).