diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 46531e57bf9..d4b548db7f2 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 683c8bdf6e1..c7e9da12195 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
 	{