diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8edd7f4d5e9..a90d832f6c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-01  Richard Guenther  <rguenther@suse.de>
+
+	* tree-cfg.c (verify_gimple_expr): Fix check for conversions
+	between integral types.  Also allow conversions between
+	pointer types.
+
 2007-08-31  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
 	* optabs.c (prepare_float_lib_cmp): Use
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 8e889fa0ecd..e70b440dfc2 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -3574,8 +3574,10 @@ verify_gimple_expr (tree expr)
 	    return true;
 	  }
 
-	/* Allow conversions between integral types.  */
-        if (INTEGRAL_TYPE_P (type) == INTEGRAL_TYPE_P (TREE_TYPE (op)))
+	/* Allow conversions between integral types and between
+	   pointer types.  */
+        if ((INTEGRAL_TYPE_P (type) && INTEGRAL_TYPE_P (TREE_TYPE (op)))
+	    || (POINTER_TYPE_P (type) && POINTER_TYPE_P (TREE_TYPE (op))))
 	  return false;
 
 	/* Allow conversions between integral types and pointers only if