[gcc r13-2273] tree-optimization/67196 - normalize use predicates earlier

[Richard Biener <rguenth@gcc.gnu.org>]

https://gcc.gnu.org/g:61051ee5cfd59ee292984641d02caac85f6dfac3

commit r13-2273-g61051ee5cfd59ee292984641d02caac85f6dfac3
Author: Richard Biener <rguenther@suse.de>
Date:   Tue Aug 30 11:47:49 2022 +0200

    tree-optimization/67196 - normalize use predicates earlier
    
    The following makes sure to have use predicates simplified and
    normalized before doing uninit_analysis::overlap because that
    otherwise cannot pick up all flag setting cases.  This fixes
    half of the issue in PR67196 and conveniently resolves the
    XFAIL in gcc.dg/uninit-pred-7_a.c.
    
            PR tree-optimization/67196
            * gimple-predicate-analysis.cc (uninit_analysis::is_use_guarded):
            Simplify and normalize use prediates before first use.
    
            * gcc.dg/uninit-pred-7_a.c: Un-XFAIL.

Diff:
---
 gcc/gimple-predicate-analysis.cc       | 6 +++---
 gcc/testsuite/gcc.dg/uninit-pred-7_a.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/gimple-predicate-analysis.cc b/gcc/gimple-predicate-analysis.cc
index 2b279ccd4b6..f8c63d24537 100644
--- a/gcc/gimple-predicate-analysis.cc
+++ b/gcc/gimple-predicate-analysis.cc
@@ -2105,6 +2105,9 @@ uninit_analysis::is_use_guarded (gimple *use_stmt, basic_block use_bb,
   if (!init_use_preds (use_preds, def_bb, use_bb))
     return false;
 
+  use_preds.simplify (use_stmt, /*is_use=*/true);
+  use_preds.normalize (use_stmt, /*is_use=*/true);
+
   /* Try to prune the dead incoming phi edges.  */
   if (!overlap (phi, opnds, visited, use_preds))
     {
@@ -2124,9 +2127,6 @@ uninit_analysis::is_use_guarded (gimple *use_stmt, basic_block use_bb,
       m_phi_def_preds.normalize (phi);
     }
 
-  use_preds.simplify (use_stmt, /*is_use=*/true);
-  use_preds.normalize (use_stmt, /*is_use=*/true);
-
   /* Return true if the predicate guarding the valid definition (i.e.,
      *THIS) is a superset of the predicate guarding the use (i.e.,
      USE_PREDS).  */
diff --git a/gcc/testsuite/gcc.dg/uninit-pred-7_a.c b/gcc/testsuite/gcc.dg/uninit-pred-7_a.c
index 434d90ac570..c2ba2a4248d 100644
--- a/gcc/testsuite/gcc.dg/uninit-pred-7_a.c
+++ b/gcc/testsuite/gcc.dg/uninit-pred-7_a.c
@@ -23,7 +23,7 @@ int foo (int n, int l, int m, int r)
       blah(v); /* { dg-bogus "uninitialized" "bogus warning" } */
 
   if ( l )
-      blah(v); /* { dg-bogus "uninitialized" "bogus warning" { xfail *-*-* } } */
+      blah(v); /* { dg-bogus "uninitialized" "bogus warning" } */
 
   return 0;
 }