mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-27 13:54:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tree-inline: Remove .ASAN_MARK calls when inlining functions into no_sanitize callers [PR114956]

Browse Source 
In r9-5742 we've started allowing to inline always_inline functions into
functions which have disabled e.g. address sanitization even when the
always_inline function is implicitly from command line options sanitized.

This mostly works fine because most of the asan instrumentation is done only
late after ipa, but as the following testcase the .ASAN_MARK ifn calls
gimplifier adds can result in ICEs.

Fixed by dropping those during inlining, similarly to how we drop
.TSAN_FUNC_EXIT calls.

2024-05-07  Jakub Jelinek  <jakub@redhat.com>

	PR sanitizer/114956
	* tree-inline.cc: Include asan.h.
	(copy_bb): Remove also .ASAN_MARK calls if id->dst_fn has asan/hwasan
	sanitization disabled.

	* gcc.dg/asan/pr114956.c: New test.

(cherry picked from commit d4e25cf4f7)
This commit is contained in:
Jakub Jelinek 2024-05-07 21:29:14 +02:00
parent bf134407b4
commit 25bd98dfd9
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gcc/testsuite/gcc.dg/asan/pr114956.c Normal file
View File

@ -0,0 +1,26 @@
/* PR sanitizer/114956 */
/* { dg-do compile } */
/* { dg-options "-O2 -fsanitize=address,null" } */
int **a;
void qux (int *);
__attribute__((always_inline)) static inline int *
foo (void)
{
int b[1];
qux (b);
return a[1];
}
__attribute__((no_sanitize_address)) void
bar (void)
{
*a = foo ();
}
void
baz (void)
{
bar ();
}

28
gcc/tree-inline.cc
View File

@ -65,6 +65,7 @@ along with GCC; see the file COPYING3. If not see
#include "symbol-summary.h" #include "symbol-summary.h"
#include "symtab-thunks.h" #include "symtab-thunks.h"
#include "symtab-clones.h" #include "symtab-clones.h"
#include "asan.h"
/* I'm not real happy about this, but we need to handle gimple and /* I'm not real happy about this, but we need to handle gimple and
non-gimple trees. */ non-gimple trees. */
@ -2210,13 +2211,26 @@ copy_bb (copy_body_data *id, basic_block bb,
} }
else if (call_stmt else if (call_stmt
&& id->call_stmt && id->call_stmt
&& gimple_call_internal_p (stmt) && gimple_call_internal_p (stmt))
&& gimple_call_internal_fn (stmt) == IFN_TSAN_FUNC_EXIT) switch (gimple_call_internal_fn (stmt))
{ {
/* Drop TSAN_FUNC_EXIT () internal calls during inlining. */ case IFN_TSAN_FUNC_EXIT:
gsi_remove (&copy_gsi, false); /* Drop .TSAN_FUNC_EXIT () internal calls during inlining. */
continue; gsi_remove (&copy_gsi, false);
} continue;
case IFN_ASAN_MARK:
/* Drop .ASAN_MARK internal calls during inlining into
no_sanitize functions. */
if (!sanitize_flags_p (SANITIZE_ADDRESS, id->dst_fn)
&& !sanitize_flags_p (SANITIZE_HWADDRESS, id->dst_fn))
{
gsi_remove (&copy_gsi, false);
continue;
}
break;
default:
break;
}
/* Statements produced by inlining can be unfolded, especially /* Statements produced by inlining can be unfolded, especially
when we constant propagated some operands. We can't fold when we constant propagated some operands. We can't fold