associated.c: Check for associated(NULL,NULL).

2006-12-17  Tobias Burnus  <burnus@net-b.de>

    * intrinsics/associated.c: Check for associated(NULL,NULL).

2006-12-17  Tobias Burnus  <burnus@net-b.de>

    * gfortran.dg/associated_2.f90: Add test for associated(NULL,NULL).

From-SVN: r119989

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6d8074e2fc8ad05aa343639f7f57bcda88e768a3..39abc504ee740993c3c2af78d13e21cba999290d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-17  Tobias Burnus  <burnus@net-b.de>
+
+       * gfortran.dg/associated_2.f90: Add test for associated(NULL,NULL).
+
 2006-12-16  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
        PR middle-end/7651

diff --git a/gcc/testsuite/gfortran.dg/associated_2.f90 b/gcc/testsuite/gfortran.dg/associated_2.f90
index 5b8b689d1f4b6271440f2af6e1185260dac4a71d..1ff8006de009824c5f60543f6b64510ef5cd7745 100644 (file)
--- a/gcc/testsuite/gfortran.dg/associated_2.f90
+++ b/gcc/testsuite/gfortran.dg/associated_2.f90
@@ -17,6 +17,8 @@ contains
 ! the target argument is not present (case (i))
     if (.not. associated (b)) call abort ()
     deallocate (a)
+    nullify(a)
+    if(associated(a,a)) call abort()
     allocate (a(2,1,2))
     b => a
     if (.not.associated (b)) call abort ()

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 0844d1a6df7c1c290e9b7b1ff978157c8bde586a..ff7adbe2da655dd225927fcff0ef61e8a0bc011a 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-17  Tobias Burnus  <burnus@net-b.de>
+
+       * intrinsics/associated.c: Check for associated(NULL,NULL).
+
 2006-12-15  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libfortran/30145

diff --git a/libgfortran/intrinsics/associated.c b/libgfortran/intrinsics/associated.c
index 1a05f20072bca00146e4330919dc1f46ae742ba9..d5ef556b80cff154b5afebe36c3cf04f463a41d2 100644 (file)
--- a/libgfortran/intrinsics/associated.c
+++ b/libgfortran/intrinsics/associated.c
@@ -39,6 +39,8 @@ associated (const gfc_array_void *pointer, const gfc_array_void *target)
 {
   int n, rank;
 
+  if (GFC_DESCRIPTOR_DATA (pointer) == NULL)
+    return 0;
   if (GFC_DESCRIPTOR_DATA (pointer) != GFC_DESCRIPTOR_DATA (target))
     return 0;
   if (GFC_DESCRIPTOR_DTYPE (pointer) != GFC_DESCRIPTOR_DTYPE (target))