From 552a617239537b3913b01f77d8b7db6cc4b5d66e Mon Sep 17 00:00:00 2001 From: kargl Date: Mon, 18 May 2015 21:52:03 +0000 Subject: [PATCH] 2015-05-18 Steven G. Kargl 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 PR fortran/66043 * gfortran.dg/storage_size_6.f90: New tests. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223320 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/check.c | 9 +++++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/storage_size_6.f90 | 8 ++++++++ 4 files changed, 27 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/storage_size_6.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 1c66684ecbe..9da169462b7 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,10 @@ 2015-05-18 Steven G. Kargl + PR fortran/66043 + * gfortran.dg/storage_size_6.f90: New tests. + +2015-05-18 Steven G. Kargl + 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 3e0ce5c8624..a6ba549f296 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 38f7ac1c2a8..bda83a50ed9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2015-05-18 Steven G. Kargl + PR fortran/66043 + * gfortran.dg/storage_size_6.f90: New tests. + +2015-05-18 Steven G. Kargl + 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 00000000000..503829231cc --- /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 +! +program p + print *, storage_size(null()) ! { dg-error "cannot be an actual" } +end -- 2.11.4.GIT