From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 27 Feb 2007 14:26:13 +0000 (+0000)
Subject: 2007-02-27  Richard Guenther  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42adef8f3242f13e3ba9296706a81e53dc62ca4f;p=thirdparty%2Fgcc.git

2007-02-27  Richard Guenther  <rguenther@suse.de>

	* trans-array.c (structure_alloc_comps): Use correct type
	for null pointer constant.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122375 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 46531e57bf95..d4b548db7f20 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-27  Richard Guenther  <rguenther@suse.de>
+
+	* trans-array.c (structure_alloc_comps): Use correct type
+	for null pointer constant.
+
 2007-02-26  Brooks Moses  <brooks.moses@codesourcery.com>
 
 	* gfortran.texi: Standardize title page, remove version number
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 683c8bdf6e1a..c7e9da12195b 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -4990,7 +4990,7 @@ structure_alloc_comps (gfc_symbol * der_type, tree decl,
 
 	  null_cond = gfc_conv_descriptor_data_get (decl);
 	  null_cond = build2 (NE_EXPR, boolean_type_node, null_cond,
-			      build_int_cst (TREE_TYPE (tmp), 0));
+			      build_int_cst (TREE_TYPE (null_cond), 0));
 	}
       else
 	{