[gcc(refs/users/aoliva/heads/testme)] noncontiguous ifcombine: skip marking of non-SSA_NAMEs [PR117915]

[Alexandre Oliva via Gcc-cvs]

https://gcc.gnu.org/g:b900a23bc83b79f8fdf04195f795bffb242439a1

commit b900a23bc83b79f8fdf04195f795bffb242439a1
Author: Alexandre Oliva <ol...@adacore.com>
Date:   Tue Dec 17 03:09:49 2024 -0300

    noncontiguous ifcombine: skip marking of non-SSA_NAMEs [PR117915]
    
    When ifcombine_mark_ssa_name is called directly, rather than by
    ifcombine_mark_ssa_name_walk, we need to check that name is an
    SSA_NAME at the caller or in the function itself.  For convenience and
    safety, I'm moving the checks from _walk to the implementation proper.
    
    
    for  gcc/ChangeLog
    
            PR tree-optimization/117915
            * tree-ssa-ifcombine.cc (ifcombine_mark_ssa_name): Move
            preconditions from...
            (ifcombine_mark_ssa_name_walk): ... here.
    
    for  gcc/testsuite/ChangeLog
    
            PR tree-optimization/117915
            * gcc.dg/pr117915.c: New.

Diff:
---
 gcc/testsuite/gcc.dg/pr117915.c | 9 +++++++++
 gcc/tree-ssa-ifcombine.cc       | 5 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/pr117915.c b/gcc/testsuite/gcc.dg/pr117915.c
new file mode 100644
index 000000000000..5f9f4ecf4980
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr117915.c
@@ -0,0 +1,9 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fno-tree-copy-prop -fno-tree-vrp" } */
+
+unsigned a;
+int b, c;
+int main() {
+  a = a & b || (c || b) | a;
+  return 0;
+}
diff --git a/gcc/tree-ssa-ifcombine.cc b/gcc/tree-ssa-ifcombine.cc
index de8db2be5572..02c2f5a29b56 100644
--- a/gcc/tree-ssa-ifcombine.cc
+++ b/gcc/tree-ssa-ifcombine.cc
@@ -475,7 +475,7 @@ update_profile_after_ifcombine (basic_block inner_cond_bb,
 static void
 ifcombine_mark_ssa_name (bitmap used, tree name, basic_block outer)
 {
-  if (SSA_NAME_IS_DEFAULT_DEF (name))
+  if (!name || TREE_CODE (name) != SSA_NAME || SSA_NAME_IS_DEFAULT_DEF (name))
     return;
 
   gimple *def = SSA_NAME_DEF_STMT (name);
@@ -502,8 +502,7 @@ ifcombine_mark_ssa_name_walk (tree *t, int *, void *data_)
 {
   ifcombine_mark_ssa_name_t *data = (ifcombine_mark_ssa_name_t *)data_;
 
-  if (*t && TREE_CODE (*t) == SSA_NAME)
-    ifcombine_mark_ssa_name (data->used, *t, data->outer);
+  ifcombine_mark_ssa_name (data->used, *t, data->outer);
 
   return NULL;
 }