diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb8bc9519fd1dbb9a32373798ed1cbd7558e5fb4..28c5a3059ad3d041617fb84b17e46524f4257cbe 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-04  Richard Guenther  <rguenther@suse.de>
+
+	* tree-inline.c (estimate_num_insns_1): Treat CONVERT_EXPR
+	the same as NOP_EXPR.
+
 2007-07-04  Nick Clifton  <nickc@redhat.com>
 
 	* target.h (struct gcc_target): Add target_help field.
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 244b5b075593583ad96195314ea430464ae66ac1..2a350cc75b5880c907b243b532e083b547350da4 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1984,6 +1984,7 @@ estimate_num_insns_1 (tree *tp, int *walk_subtrees, void *data)
     case BIND_EXPR:
     case WITH_CLEANUP_EXPR:
     case NOP_EXPR:
+    case CONVERT_EXPR:
     case VIEW_CONVERT_EXPR:
     case SAVE_EXPR:
     case ADDR_EXPR:
@@ -2127,8 +2128,6 @@ estimate_num_insns_1 (tree *tp, int *walk_subtrees, void *data)
     case UNEQ_EXPR:
     case LTGT_EXPR:
 
-    case CONVERT_EXPR:
-
     case CONJ_EXPR:
 
     case PREDECREMENT_EXPR: