aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2019-12-18 16:34:06 +0000
committerHarald Anlauf <anlauf@gcc.gnu.org>2019-12-18 16:34:06 +0000
commit6573d760cdfec1b4577b268ce1ff19cecc4c9cbd (patch)
treef124dd019a09cfeeb03d29ba89a3711808104e9d /gcc
parente986ce3bd611f3887b4aa9fe1505436970478711 (diff)
downloadgcc-6573d760cdfec1b4577b268ce1ff19cecc4c9cbd.zip
gcc-6573d760cdfec1b4577b268ce1ff19cecc4c9cbd.tar.gz
gcc-6573d760cdfec1b4577b268ce1ff19cecc4c9cbd.tar.bz2
re PR fortran/70853 (ICE on pointing to null, in gfc_add_block_to_block, at fortran/trans.c:1599)
2019-12-18 Harald Anlauf <anlauf@gmx.de> PR fortran/70853 * trans-expr.c (gfc_trans_pointer_assignment): Reject bounds remapping if pointer target is NULL(). PR fortran/70853 * gfortran.dg/pr70853.f90: New test. From-SVN: r279527
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/trans-expr.c7
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/pr70853.f908
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f8103bb..b3a5b0d 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-18 Harald Anlauf <anlauf@gmx.de>
+
+ PR fortran/70853
+ * trans-expr.c (gfc_trans_pointer_assignment): Reject bounds
+ remapping if pointer target is NULL().
+
2019-12-12 Harald Anlauf <anlauf@gmx.de>
PR fortran/92898
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index fe89c7b..eb3250a 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -9218,6 +9218,13 @@ gfc_trans_pointer_assignment (gfc_expr * expr1, gfc_expr * expr2)
break;
rank_remap = (remap && remap->u.ar.end[0]);
+ if (remap && expr2->expr_type == EXPR_NULL)
+ {
+ gfc_error ("If bounds remapping is specified at %L, "
+ "the pointer target shall not be NULL", &expr1->where);
+ return NULL_TREE;
+ }
+
gfc_init_se (&lse, NULL);
if (remap)
lse.descriptor_only = 1;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index df1299d..9424480 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-18 Harald Anlauf <anlauf@gmx.de>
+
+ PR fortran/70853
+ * gfortran.dg/pr70853.f90: New test.
+
2019-12-18 Martin Jambor <mjambor@suse.cz>
PR ipa/92971
diff --git a/gcc/testsuite/gfortran.dg/pr70853.f90 b/gcc/testsuite/gfortran.dg/pr70853.f90
new file mode 100644
index 0000000..9ae44cc
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr70853.f90
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! PR fortran/70853
+! Contributed by Gerhard Steinmetz
+program p
+ real, pointer :: z(:)
+ z(1:2) => null() ! { dg-error "pointer target shall not be NULL" }
+ z(2:1) => null() ! { dg-error "pointer target shall not be NULL" }
+end