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

[strub] improve handling of indirected volatile parms [PR112938]

Browse source 
The earlier patch for PR112938 arranged for volatile parms to be made
indirect in internal strub wrapped bodies.

The first problem that remained, more evident, was that the indirected
parameter remained volatile, despite the indirection, but it wasn't
regimplified, so indirecting it was malformed gimple.

Regimplifying turned out not to be needed.  The best course of action
was to drop the volatility from the by-reference parm, that was being
unexpectedly inherited from the original volatile parm.

That exposed another problem: the dereferences would then lose their
volatile status, so we had to bring volatile back to them.


for  gcc/ChangeLog

	PR middle-end/112938
	* ipa-strub.cc (pass_ipa_strub::execute): Drop volatility from
	indirected parm.
	(maybe_make_indirect): Restore volatility in dereferences.

for  gcc/testsuite/ChangeLog

	PR middle-end/112938
	* g++.dg/strub-internal-pr112938.cc: New.
This commit is contained in:
Alexandre Oliva 2024-04-16 01:24:59 -03:00 • committed by Alexandre Oliva
parent 46d914d0e0
commit c39dc5bb65
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/ipa-strub.cc
View file

@ -1940,6 +1940,9 @@ maybe_make_indirect (indirect_parms_t &indirect_parms, tree op, int *rec)
TREE_TYPE (TREE_TYPE (op)),
op,
build_int_cst (TREE_TYPE (op), 0));
if (TYPE_VOLATILE (TREE_TYPE (TREE_TYPE (op)))
&& !TREE_THIS_VOLATILE (ret))
TREE_SIDE_EFFECTS (ret) = TREE_THIS_VOLATILE (ret) = 1;
return ret;
}
}
@ -2894,6 +2897,10 @@ pass_ipa_strub::execute (function *)
probably drop the TREE_ADDRESSABLE and keep the TRUE. */
tree ref_type = build_ref_type_for (nparm);
if (TREE_THIS_VOLATILE (nparm)
&& TYPE_VOLATILE (TREE_TYPE (nparm))
&& !TYPE_VOLATILE (ref_type))
TREE_SIDE_EFFECTS (nparm) = TREE_THIS_VOLATILE (nparm) = 0;
DECL_ARG_TYPE (nparm) = TREE_TYPE (nparm) = ref_type;
relayout_decl (nparm);
TREE_ADDRESSABLE (nparm) = 0;

12
gcc/testsuite/g++.dg/strub-internal-pr112938.cc Normal file
View file

@ -0,0 +1,12 @@
/* { dg-do compile } */
/* { dg-options "-fdump-tree-optimized -O2" } */
/* { dg-require-effective-target strub } */
bool __attribute__ ((__strub__ ("internal")))
f(bool i, volatile bool j)
{
return (i ^ j) == j;
}
/* Check for two dereferences of the indirected volatile j parm. */
/* { dg-final { scan-tree-dump-times {={v} \*j_[0-9][0-9]*(D)} 2 "optimized" } } */