From 9df0f6bd582ceee53bfed8769cf156329ae33bd0 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Tue, 26 Sep 2023 09:27:52 -0400 Subject: [PATCH] Ensure ssa_name is still valid. When the IL changes, an equivalence set may contain ssa_names that no longer exist. Ensure names are still valid and not in the free list. PR tree-optimization/111599 gcc/ * value-relation.cc (relation_oracle::valid_equivs): Ensure ssa_name is valid. gcc/testsuite/ * gcc.dg/pr111599.c: New. --- gcc/testsuite/gcc.dg/pr111599.c | 16 ++++++++++++++++ gcc/value-relation.cc | 9 ++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr111599.c diff --git a/gcc/testsuite/gcc.dg/pr111599.c b/gcc/testsuite/gcc.dg/pr111599.c new file mode 100644 index 00000000000..25880b759f7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr111599.c @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-O3 -fno-inline-functions-called-once -fno-inline-small-functions -fno-tree-dce -fno-tree-forwprop -fno-tree-fre" } */ + +int h(void); +void l(int); +void func_56(int p_57, unsigned p_58) { + // p_57 = 0x101BC642L; + if (p_57 || h()) { + int *l_105[2]; + l_105[0] = &p_57; + l(p_57); + } +} +void func_31(int p_33) { + func_56(0x101BC642L, (p_33)); +} diff --git a/gcc/value-relation.cc b/gcc/value-relation.cc index f2c668a0193..8fea4aad345 100644 --- a/gcc/value-relation.cc +++ b/gcc/value-relation.cc @@ -274,9 +274,12 @@ relation_oracle::valid_equivs (bitmap b, const_bitmap equivs, basic_block bb) EXECUTE_IF_SET_IN_BITMAP (equivs, 0, i, bi) { tree ssa = ssa_name (i); - const_bitmap ssa_equiv = equiv_set (ssa, bb); - if (ssa_equiv == equivs) - bitmap_set_bit (b, i); + if (ssa && !SSA_NAME_IN_FREE_LIST (ssa)) + { + const_bitmap ssa_equiv = equiv_set (ssa, bb); + if (ssa_equiv == equivs) + bitmap_set_bit (b, i); + } } } -- 2.41.0