2011-03-21 Richard Guenther <rguenther@suse.de>

	PR middle-end/47661
	* gimple.c (is_gimple_condexpr): Use tree_could_throw_p.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5562ba9..cd4bca4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 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
        * params.def (lto-partitions): Require at least 1 partition.
 

diff --git a/gcc/gimple.c b/gcc/gimple.c
index e686e63..81607d9 100644 (file)
--- 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))));
 }