procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add function context for querying global ranges.

Browse source 
When processing arguments for assume functions, call get_global_range
directly and utilize a function context pointer to avoid any assumptions
about using cfun.

	PR tree-optimization/108520
	gcc/
	* gimple-range-infer.cc (check_assume_func): Invoke
	gimple_range_global directly instead using global_range_query.
	* value-query.cc (get_range_global): Add function context and
	avoid calling nonnull_arg_p if not cfun.
	(gimple_range_global): Add function context pointer.
	* value-query.h (imple_range_global): Add function context.

	gcc/testsuite/
	* g++.dg/pr108520.C: New.
This commit is contained in:
Andrew MacLeod 2023-02-06 13:07:01 -05:00
parent edfc440250
commit 99f3ad2e5b
4 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gcc/gimple-range-infer.cc
View file

@ -84,7 +84,7 @@ gimple_infer_range::check_assume_func (gcall *call)
continue;
// Query the global range of the default def in the assume function.
Value_Range assume_range (type);
global_ranges.range_of_expr (assume_range, default_def);
gimple_range_global (assume_range, default_def, fun);
// If there is a non-varying result, add it as an inferred range.
if (!assume_range.varying_p ())
{

17
gcc/testsuite/g++.dg/pr108520.C Normal file
View file

@ -0,0 +1,17 @@
// { dg-do compile { target c++23 } }
// { dg-options "-O2" }
static void foo () {}
struct S { void (*f) (); };
[[gnu::nonnull (1)]]
void
bar (void *x)
{
struct S a[3] = { { foo }, { foo }, { foo } };
for (struct S *i = a, *e = a + 3; i != e; i++)
{
[[assume (i->f)]];
i->f ();
}
}

10
gcc/value-query.cc
View file

@ -312,7 +312,7 @@ get_ssa_name_ptr_info_nonnull (const_tree name)
// return VARYING.
static void
get_range_global (vrange &r, tree name)
get_range_global (vrange &r, tree name, struct function *fun = cfun)
{
tree type = TREE_TYPE (name);
@ -327,7 +327,7 @@ get_range_global (vrange &r, tree name)
// anti-ranges for pointers. Note that this is only valid with
// default definitions of PARM_DECLs.
if (POINTER_TYPE_P (type)
&& ((cfun && nonnull_arg_p (sym))
&& ((cfun && fun == cfun && nonnull_arg_p (sym))
|| get_ssa_name_ptr_info_nonnull (name)))
r.set_nonzero (type);
else if (!POINTER_TYPE_P (type))
@ -378,15 +378,15 @@ get_range_global (vrange &r, tree name)
// https://gcc.gnu.org/pipermail/gcc-patches/2021-June/571709.html
void
gimple_range_global (vrange &r, tree name)
gimple_range_global (vrange &r, tree name, struct function *fun)
{
tree type = TREE_TYPE (name);
gcc_checking_assert (TREE_CODE (name) == SSA_NAME);
if (SSA_NAME_IS_DEFAULT_DEF (name) || (cfun && cfun->after_inlining)
if (SSA_NAME_IS_DEFAULT_DEF (name) || (fun && fun->after_inlining)
|| is_a<gphi *> (SSA_NAME_DEF_STMT (name)))
{
get_range_global (r, name);
get_range_global (r, name, fun);
return;
}
r.set_varying (type);

4
gcc/value-query.h
View file

@ -143,6 +143,8 @@ get_range_query (const struct function *fun)
return fun->x_range_query ? fun->x_range_query : &global_ranges;
}
extern void gimple_range_global (vrange &v, tree name);
// Query the global range of NAME in function F. Default to cfun.
extern void gimple_range_global (vrange &v, tree name,
struct function *f = cfun);
#endif // GCC_QUERY_H