2005-09-08 Andrew Pinski <pinskia@physics.uc.edu>

        * tree-vrp.c (extract_range_from_expr): Move the check for non
        nullness after the check for gimple invariant.


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

2 files changed, 7 insertions, 2 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d2c6693e6a8..a360100785f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-08  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* tree-vrp.c (extract_range_from_expr): Move the check for non
+	nullness after the check for gimple invariant.
+
 2005-09-08  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* tree.c (host_integerp, tree_low_cst): Correct function comment.
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index 77ddd3a4d9e..ab6dc58e7ed 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -1517,10 +1517,10 @@ extract_range_from_expr (value_range_t *vr, tree expr)
     extract_range_from_unary_expr (vr, expr);
   else if (TREE_CODE_CLASS (code) == tcc_comparison)
     extract_range_from_comparison (vr, expr);
-  else if (vrp_expr_computes_nonzero (expr))
-    set_value_range_to_nonnull (vr, TREE_TYPE (expr));
   else if (is_gimple_min_invariant (expr))
     set_value_range (vr, VR_RANGE, expr, expr, NULL);
+  else if (vrp_expr_computes_nonzero (expr))
+    set_value_range_to_nonnull (vr, TREE_TYPE (expr));
   else
     set_value_range_to_varying (vr);
 }