aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorTobias Burnus <burnus@gcc.gnu.org>2006-12-19 20:41:35 +0100
committerTobias Burnus <burnus@gcc.gnu.org>2006-12-19 20:41:35 +0100
commit23572654a20c852cd9c33fd0cfd1d67b3d57f97d (patch)
tree5264f0f15c96d50849b7ca4a42e6745b545a0fec /gcc/fortran
parent41da2805f38799eb92a3bf178a5e8dac6815066f (diff)
downloadgcc-23572654a20c852cd9c33fd0cfd1d67b3d57f97d.zip
gcc-23572654a20c852cd9c33fd0cfd1d67b3d57f97d.tar.gz
gcc-23572654a20c852cd9c33fd0cfd1d67b3d57f97d.tar.bz2
re PR fortran/30238 (associated(null-pointer, null-pointer) returns .true.)
fortran/ 2006-12-19 Tobias Burnus <burnus@net-b.de> PR fortran/39238 * trans-intrinsic.c: Check for associated(NULL,NULL). testsuite/ 2006-12-19 Tobias Burnus <burnus@net-b.de> PR fortran/39238 * gfortran.dg/associated_1.f90: Add test for associated(NULL,NULL). From-SVN: r120056
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/trans-intrinsic.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 89c1252..ee984b1 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-19 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/39238
+ * trans-intrinsic.c: Check for associated(NULL,NULL).
+
2006-12-19 Paul Thomas <pault@gcc.gnu.org>
PR fortran/30236
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c
index d284931..c10e9e5 100644
--- a/gcc/fortran/trans-intrinsic.c
+++ b/gcc/fortran/trans-intrinsic.c
@@ -3142,7 +3142,9 @@ gfc_conv_associated (gfc_se *se, gfc_expr *expr)
gfc_add_block_to_block (&se->pre, &arg1se.pre);
gfc_add_block_to_block (&se->post, &arg1se.post);
tmp = build2 (EQ_EXPR, boolean_type_node, arg1se.expr, arg2se.expr);
- se->expr = tmp;
+ tmp2 = build2 (NE_EXPR, boolean_type_node, arg1se.expr,
+ null_pointer_node);
+ se->expr = build2 (TRUTH_AND_EXPR, boolean_type_node, tmp, tmp2);
}
else
{