From 5594a028feb4b97996bd93efae74eec9a4295303 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 13 Dec 2016 14:33:35 +0100 Subject: [PATCH] Rename BUILT_IN_ASAN_CLOBBER_N to * asan.c (asan_expand_mark_ifn): Use renamed BUILT_IN_ASAN_{UN}CLOBBER_N to BUILT_IN_ASAN_{UN}POISON_STACK_MEMORY. * sanitizer.def: Likewise. From-SVN: r243605 --- gcc/ChangeLog | 6 ++++++ gcc/asan.c | 5 +++-- gcc/sanitizer.def | 6 ++++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5fd41549487..05ddb301d73 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-12-13 Martin Liska + + * asan.c (asan_expand_mark_ifn): Use renamed + BUILT_IN_ASAN_{UN}CLOBBER_N to BUILT_IN_ASAN_{UN}POISON_STACK_MEMORY. + * sanitizer.def: Likewise. + 2016-12-13 James Greenhalgh * doc/extend.texi (Half-Precision): Update to document current diff --git a/gcc/asan.c b/gcc/asan.c index e297784270d..53acff0a2fb 100644 --- a/gcc/asan.c +++ b/gcc/asan.c @@ -2838,8 +2838,9 @@ asan_expand_mark_ifn (gimple_stmt_iterator *iter) gsi_insert_before (iter, g, GSI_SAME_STMT); tree sz_arg = gimple_assign_lhs (g); - tree fun = builtin_decl_implicit (is_poison ? BUILT_IN_ASAN_CLOBBER_N - : BUILT_IN_ASAN_UNCLOBBER_N); + tree fun + = builtin_decl_implicit (is_poison ? BUILT_IN_ASAN_POISON_STACK_MEMORY + : BUILT_IN_ASAN_UNPOISON_STACK_MEMORY); g = gimple_build_call (fun, 2, base_addr, sz_arg); gimple_set_location (g, loc); gsi_insert_after (iter, g, GSI_NEW_STMT); diff --git a/gcc/sanitizer.def b/gcc/sanitizer.def index 3db08a7b702..43e46f90e9c 100644 --- a/gcc/sanitizer.def +++ b/gcc/sanitizer.def @@ -165,9 +165,11 @@ DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_BEFORE_DYNAMIC_INIT, DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_AFTER_DYNAMIC_INIT, "__asan_after_dynamic_init", BT_FN_VOID, ATTR_NOTHROW_LEAF_LIST) -DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_CLOBBER_N, "__asan_poison_stack_memory", +DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_POISON_STACK_MEMORY, + "__asan_poison_stack_memory", BT_FN_VOID_PTR_PTRMODE, ATTR_NOTHROW_LEAF_LIST) -DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_UNCLOBBER_N, "__asan_unpoison_stack_memory", +DEF_SANITIZER_BUILTIN(BUILT_IN_ASAN_UNPOISON_STACK_MEMORY, + "__asan_unpoison_stack_memory", BT_FN_VOID_PTR_PTRMODE, ATTR_NOTHROW_LEAF_LIST) /* Thread Sanitizer */ -- 2.30.2