re PR fortran/79229 (ICE in gfc_trans_assignment_1 with -fcheck=mem)

gcc/testsuite/ChangeLog:

2017-02-19  Andre Vehreschild  <vehre@gcc.gnu.org>

	PR fortran/79229
	* gfortran.dg/class_allocate_24.f90: New test.

gcc/fortran/ChangeLog:

2017-02-19  Andre Vehreschild  <vehre@gcc.gnu.org>

	PR fortran/79229
	* trans-expr.c (gfc_trans_assignment_1): Deref indirect refs when
	compiling with -fcheck=mem to check the pointer and not the data.

From-SVN: r245581

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 82733be6fa444eff8e8a060e07f5068605a16eff..3dfbbc5ed5b4d4bd85198b1a425f2d1e5f03edb3 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -5,6 +5,12 @@
        (gfc_resolve_expr): Call it for dummy variables with a unique
        symtree name.
 
+2017-02-19  Andre Vehreschild  <vehre@gcc.gnu.org>
+
+       PR fortran/79229
+       * trans-expr.c (gfc_trans_assignment_1): Deref indirect refs when
+       compiling with -fcheck=mem to check the pointer and not the data.
+
 2017-02-19  Andre Vehreschild  <vehre@gcc.gnu.org>
 
        PR fortran/79335

diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index cc41fe3fe6d0bfdc0acd730ae0e910d365bb5a09..9c4715b44be102d8fac22e62605889f8ac84632a 100644 (file)
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -9961,13 +9961,16 @@ gfc_trans_assignment_1 (gfc_expr * expr1, gfc_expr * expr2, bool init_flag,
          tree cond;
          const char* msg;
 
+         tmp = INDIRECT_REF_P (lse.expr)
+             ? gfc_build_addr_expr (NULL_TREE, lse.expr) : lse.expr;
+
          /* We should only get array references here.  */
-         gcc_assert (TREE_CODE (lse.expr) == POINTER_PLUS_EXPR
-                     || TREE_CODE (lse.expr) == ARRAY_REF);
+         gcc_assert (TREE_CODE (tmp) == POINTER_PLUS_EXPR
+                     || TREE_CODE (tmp) == ARRAY_REF);
 
          /* 'tmp' is either the pointer to the array(POINTER_PLUS_EXPR)
             or the array itself(ARRAY_REF).  */
-         tmp = TREE_OPERAND (lse.expr, 0);
+         tmp = TREE_OPERAND (tmp, 0);
 
          /* Provide the address of the array.  */
          if (TREE_CODE (lse.expr) == ARRAY_REF)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ada192093afc8d9eb82d9096157a1472f895946b..eb74a459abfe60e20e1fce04f6a8e5eef5c1f80f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-19  Andre Vehreschild  <vehre@gcc.gnu.org>
+
+       PR fortran/79229
+       * gfortran.dg/class_allocate_24.f90: New test.
+
 2017-02-19  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/79402

diff --git a/gcc/testsuite/gfortran.dg/class_allocate_24.f90 b/gcc/testsuite/gfortran.dg/class_allocate_24.f90
new file mode 100644 (file)
index 0000000..883247d
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/class_allocate_24.f90
@@ -0,0 +1,16 @@
+! { dg-do compile }
+! { dg-options "-fcheck=mem" }
+! 
+! Compile time check only, to test that the ICE is fixed in the assignment of the
+! default initializer of the class to sf.
+
+implicit none
+
+type :: t
+  integer, pointer :: data => null ()
+end type
+
+class(t), dimension(:), allocatable :: sf
+allocate (t :: sf (1))
+end
+