aboutsummaryrefslogtreecommitdiff
path: root/gcc/asan.c
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2016-11-30 10:26:51 +0100
committerMartin Liska <marxin@gcc.gnu.org>2016-11-30 09:26:51 +0000
commitfb61d96cf20d5bb6db8fd72ef7b528804e9f6be4 (patch)
treedbeaebeaf71880f943227264b45ccfab26cf47de /gcc/asan.c
parente03fb6ec681070048ecc0f1f2d2a299dc3d3db1a (diff)
downloadgcc-fb61d96cf20d5bb6db8fd72ef7b528804e9f6be4.zip
gcc-fb61d96cf20d5bb6db8fd72ef7b528804e9f6be4.tar.gz
gcc-fb61d96cf20d5bb6db8fd72ef7b528804e9f6be4.tar.bz2
Support nested functions (PR sanitizer/78541).
PR sanitizer/78541 * gcc.dg/asan/pr78541-2.c: New test. * gcc.dg/asan/pr78541.c: New test. PR sanitizer/78541 * asan.c (asan_expand_mark_ifn): Properly select a VAR_DECL from FRAME.* component reference. From-SVN: r243003
Diffstat (limited to 'gcc/asan.c')
-rw-r--r--gcc/asan.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gcc/asan.c b/gcc/asan.c
index 6e93ea3..cb5d615 100644
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -2713,6 +2713,12 @@ asan_expand_mark_ifn (gimple_stmt_iterator *iter)
tree base = gimple_call_arg (g, 1);
gcc_checking_assert (TREE_CODE (base) == ADDR_EXPR);
tree decl = TREE_OPERAND (base, 0);
+
+ /* For a nested function, we can have: ASAN_MARK (2, &FRAME.2.fp_input, 4) */
+ if (TREE_CODE (decl) == COMPONENT_REF
+ && DECL_NONLOCAL_FRAME (TREE_OPERAND (decl, 0)))
+ decl = TREE_OPERAND (decl, 0);
+
gcc_checking_assert (TREE_CODE (decl) == VAR_DECL);
if (asan_handled_variables == NULL)
asan_handled_variables = new hash_set<tree> (16);