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

Copy condition->expr map when inlining [PR114599]

Browse source 
When a function is tree-inlined, copy the condition -> expression mapping
from the inlined function into the caller, shifted so uids are not
mixed.  Tree inlining was always problematic under condition coverage -
either through a nullptr dereference (triggered by the test case), or
through quietly mixing caller conditions with the callee conditions.

	PR middle-end/114599

gcc/ChangeLog:

	* tree-inline.cc (add_local_variables): Copy cond_uids mappings.

gcc/testsuite/ChangeLog:

	* gcc.misc-tests/gcov-pr114599.c: New test.
This commit is contained in:
Jørgen Kvalsvik 2024-04-05 21:42:07 +02:00
parent 888bf71972
commit c6892a430a
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gcc/testsuite/gcc.misc-tests/gcov-pr114599.c Normal file
View file

@ -0,0 +1,25 @@
/* PR middle-end/114599 */
/* { dg-do compile } */
/* { dg-options "-fcondition-coverage" } */
/* Check that a function with a condition inlined into a function without a
conditional works. When inlining happens the condition -> expression
mapping must be carried over. */
extern int type;
void fn (void);
__attribute__((always_inline))
inline void
do_all_fn_doall_arg (void)
{
if (type)
fn ();
}
void
do_all_fn_LHASH_DOALL_ARG_arg2 (void)
{
do_all_fn_doall_arg ();
}

20
gcc/tree-inline.cc
View file

@ -4659,7 +4659,8 @@ prepend_lexical_block (tree current_block, tree new_block)
BLOCK_SUPERCONTEXT (new_block) = current_block;
}
/* Add local variables from CALLEE to CALLER. */
/* Add local variables from CALLEE to CALLER. If set for condition coverage,
copy basic condition -> expression mapping to CALLER. */
static inline void
add_local_variables (struct function *callee, struct function *caller,
@ -4689,6 +4690,23 @@ add_local_variables (struct function *callee, struct function *caller,
}
add_local_decl (caller, new_var);
}
/* If -fcondition-coverage is used and the caller has conditions, copy the
mapping into the caller but and the end so the caller and callee
expressions aren't mixed. */
if (callee->cond_uids)
{
if (!caller->cond_uids)
caller->cond_uids = new hash_map <gcond*, unsigned> ();
unsigned dst_max_uid = 0;
for (auto itr : *callee->cond_uids)
if (itr.second >= dst_max_uid)
dst_max_uid = itr.second + 1;
for (auto itr : *callee->cond_uids)
caller->cond_uids->put (itr.first, itr.second + dst_max_uid);
}
}
/* Add to BINDINGS a debug stmt resetting SRCVAR if inlining might