diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-05-18 21:52:03 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2015-05-18 21:52:03 +0000 |
| commit | ce7fb7118f9b9215a7a0320071fb0e956fec2dd6 (patch) | |
| tree | a5bad65a6692df1c301fc7f2c2576e82c753bb26 /gcc | |
| parent | 46b6b3542d8c47e285e4e606f889411e4739a886 (diff) | |
| download | gcc-ce7fb7118f9b9215a7a0320071fb0e956fec2dd6.zip gcc-ce7fb7118f9b9215a7a0320071fb0e956fec2dd6.tar.gz gcc-ce7fb7118f9b9215a7a0320071fb0e956fec2dd6.tar.bz2 | |
re PR fortran/66043 (ICE on storage_size of null or output of null array)
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66043
* check.c (gfc_check_storage_size): Prevent the direct use of NULL()
in STORAGE_SIZE() reference.
2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/66043
* gfortran.dg/storage_size_6.f90: New tests.
From-SVN: r223320
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/check.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/storage_size_6.f90 | 8 |
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1c66684..9da1694 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/66043 + * gfortran.dg/storage_size_6.f90: New tests. + +2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/66040 * parse.c(verify_st_order): Replace a gfc_internal_error with your generic gfc_error. diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 3e0ce5c..a6ba549 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -6243,6 +6243,15 @@ gfc_check_and (gfc_expr *i, gfc_expr *j) bool gfc_check_storage_size (gfc_expr *a, gfc_expr *kind) { + + if (a->expr_type == EXPR_NULL) + { + gfc_error ("Intrinsic function NULL at %L cannot be an actual " + "argument to STORAGE_SIZE, because it returns a " + "disassociated pointer", &a->where); + return false; + } + if (a->ts.type == BT_ASSUMED) { gfc_error ("%qs argument of %qs intrinsic at %L shall not be TYPE(*)", diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 38f7ac1..bda83a5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/66043 + * gfortran.dg/storage_size_6.f90: New tests. + +2015-05-18 Steven G. Kargl <kargl@gcc.gnu.org> + PR fortran/66040 * gfortran.dg/misplaced_statement.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/storage_size_6.f90 b/gcc/testsuite/gfortran.dg/storage_size_6.f90 new file mode 100644 index 0000000..5038292 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/storage_size_6.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/66043 +! +! Original code from Gerhard Steinmetz +! <gerhard dot steinmetz dot fortran at t-online dot de> +program p + print *, storage_size(null()) ! { dg-error "cannot be an actual" } +end |