From bc4a20bc57ce71da0a96bcc6ec5683640b9004d6 Mon Sep 17 00:00:00 2001
From: Martin Jambor <mjambor@suse.cz>
Date: Wed, 24 Jan 2024 16:19:48 +0100
Subject: [PATCH] ipa-cp: Fix check for exceeding param_ipa_cp_value_list_size
(PR 113490)
When the check for exceeding param_ipa_cp_value_list_size limit was
modified to be ignored for generating values from self-recursive
calls, it should have been changed from equal to, to equals to or is
greater than. This omission manifests itself as PR 113490.
When I examined the condition I also noticed that the parameter should
come from the callee rather than the caller, since the value list is
associated with the former and not the latter. In practice the limit
is of course very likely to be the same, but I fixed this aspect of
the condition too. I briefly audited all other uses of opt_for_fn in
ipa-cp.cc and all the others looked OK.
gcc/ChangeLog:
2024-01-19 Martin Jambor <mjambor@suse.cz>
PR ipa/113490
* ipa-cp.cc (ipcp_lattice<valtype>::add_value): Bail out if value
count is equal or greater than the limit. Use the limit from the
callee.
gcc/testsuite/ChangeLog:
2024-01-22 Martin Jambor <mjambor@suse.cz>
PR ipa/113490
* gcc.dg/ipa/pr113490.c: New test.
---
gcc/ipa-cp.cc | 2 +-
gcc/testsuite/gcc.dg/ipa/pr113490.c | 31 +++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.dg/ipa/pr113490.c
diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc
index b1e2a3a829ab..e85477df32d0 100644
--- a/gcc/ipa-cp.cc
+++ b/gcc/ipa-cp.cc
@@ -2298,7 +2298,7 @@ ipcp_lattice<valtype>::add_value (valtype newval, cgraph_edge *cs,
return false;
}
- if (!same_lat_gen_level && values_count == opt_for_fn (cs->caller->decl,
+ if (!same_lat_gen_level && values_count >= opt_for_fn (cs->callee->decl,
param_ipa_cp_value_list_size))
{
/* We can only free sources, not the values themselves, because sources
diff --git a/gcc/testsuite/gcc.dg/ipa/pr113490.c b/gcc/testsuite/gcc.dg/ipa/pr113490.c
new file mode 100644
index 000000000000..526e22b37879
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ipa/pr113490.c
@@ -0,0 +1,31 @@
+/* { dg-do compile { target int128 } } */
+/* { dg-options "-O3 -Wno-psabi" } */
+
+typedef char A __attribute__((vector_size (64)));
+typedef short B __attribute__((vector_size (64)));
+typedef unsigned C __attribute__((vector_size (64)));
+typedef long D __attribute__((vector_size (64)));
+typedef __int128 E __attribute__((vector_size (64)));
+
+D bar1_D_0;
+E bar4 (A, D);
+
+E
+bar1 (C C_0)
+{
+ C_0 >>= 1;
+ bar4 ((A) C_0, bar1_D_0);
+ bar4 ((A) (E) {~0 }, (D) (A){ ~0 });
+ bar4 ((A) (B) { ~0 }, (D) (C) { ~0 });
+ bar1 ((C) (D) { 0, ~0});
+ bar4 ((A) C_0, bar1_D_0);
+ (A) { bar1 ((C) { 7})[5] - C_0[63], bar4 ((A) (D) {~0}, (D) (C) { 0, ~0})[3]};
+}
+
+E
+bar4 (A A_0, D D_0)
+{
+ bar1 ((C) A_0);
+ bar1 ((C) {5});
+ bar1 ((C) D_0);
+}
--
GitLab