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

cgraph: Adjust verify_corresponds_to_fndecl [PR106061]

Browse source 
IPA passes redirect some calls in what it determines to be unreachable code
to builtin_decl_unreachable.  But that function returns sometimes
builtin_decl_explicit (BUILT_IN_UNREACHABLE) (which was what GCC 12
and earlier did always), or builtin_decl_explicit (BUILT_IN_TRAP)
(e.g. for -funreachable-traps, -O0, -Og).
Now the cgraph verification code has a code to verify cgraph edges
and has there an exception for these redirections to BUILT_IN_UNREACHABLE,
but doesn't have for BUILT_IN_TRAP, so e.g. the following testcase
ICEs during that verification.

The following patch just adds BUILT_IN_TRAP to those exceptions.

2023-01-27  Jakub Jelinek  <jakub@redhat.com>

	PR ipa/106061
	* cgraph.cc (cgraph_edge::verify_corresponds_to_fndecl): Allow
	redirection of calls to __builtin_trap in addition to redirection
	to __builtin_unreachable.

	* gcc.dg/pr106061.c: New test.
This commit is contained in:
Jakub Jelinek 2023-01-27 11:16:43 +01:00
parent 9b9a1ac14c
commit bd246ac682
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cgraph.cc
View file

@ -3248,9 +3248,11 @@ cgraph_edge::verify_corresponds_to_fndecl (tree decl)
node = node->ultimate_alias_target ();
/* Optimizers can redirect unreachable calls or calls triggering undefined
behavior to builtin_unreachable. */
behavior to __builtin_unreachable or __builtin_trap. */
if (fndecl_built_in_p (callee->decl, BUILT_IN_UNREACHABLE))
if (fndecl_built_in_p (callee->decl, BUILT_IN_NORMAL)
&& (DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_UNREACHABLE
|| DECL_FUNCTION_CODE (callee->decl) == BUILT_IN_TRAP))
return false;
if (callee->former_clone_of != node->decl

18
gcc/testsuite/gcc.dg/pr106061.c Normal file
View file

@ -0,0 +1,18 @@
/* PR ipa/106061 */
/* { dg-do compile } */
/* { dg-options "-Og" } */
extern void foo (void);
inline void
bar (int x)
{
if (x)
foo ();
}
void
baz (void)
{
bar (0);
}