diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5562ba9c138..cd4bca46200 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-21  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/47661
+	* gimple.c (is_gimple_condexpr): Use tree_could_throw_p.
+
 2011-03-21  Richard Guenther  <rguenther@suse.de>
 
 	PR lto/48210
diff --git a/gcc/gimple.c b/gcc/gimple.c
index e686e63c32a..81607d98b24 100644
--- a/gcc/gimple.c
+++ b/gcc/gimple.c
@@ -2581,7 +2581,7 @@ bool
 is_gimple_condexpr (tree t)
 {
   return (is_gimple_val (t) || (COMPARISON_CLASS_P (t)
-				&& !tree_could_trap_p (t)
+				&& !tree_could_throw_p (t)
 				&& is_gimple_val (TREE_OPERAND (t, 0))
 				&& is_gimple_val (TREE_OPERAND (t, 1))));
 }