From 79a2757f5353263dec09ff9c7c624a624d27db68 Mon Sep 17 00:00:00 2001 From: marxin Date: Tue, 13 Dec 2016 09:14:47 +0000 Subject: [PATCH] Add pretty printer for ASAN_MARK and add a helper fn * asan.c (asan_mark_poison_p): Remove. (asan_mark_p): New function. (transform_statements): Use the function. (asan_expand_mark_ifn): Do not use masked enum. * asan.h (enum asan_mark_flags): Declare it via a macro. * gimple-pretty-print.c (dump_gimple_call_args): Dump first argument of ASAN_MARK. * gimplify.c (build_asan_poison_call_expr): Use new enum values. (asan_poison_variable): Likewise. * gcc.dg/asan/use-after-scope-goto-1.c: Update first argument of scanned pattern ASAN_MARK. * gcc.dg/asan/use-after-scope-goto-2.c: Likewise. * gcc.dg/asan/use-after-scope-switch-1.c: Likewise. * gcc.dg/asan/use-after-scope-switch-2.c: Likewise. * gcc.dg/asan/use-after-scope-switch-3.c: Likewise. Change-Id: Ife3e6037a03ec2b25a15d45bb301f43b750e6649 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@243597138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/asan.c | 28 ++++++------ gcc/asan.h | 11 +++-- gcc/gimple-pretty-print.c | 51 ++++++++++++++++++---- gcc/gimple.c | 2 +- gcc/gimplify.c | 4 +- gcc/testsuite/gcc.dg/asan/use-after-scope-goto-1.c | 6 +-- gcc/testsuite/gcc.dg/asan/use-after-scope-goto-2.c | 2 +- .../gcc.dg/asan/use-after-scope-switch-1.c | 4 +- .../gcc.dg/asan/use-after-scope-switch-2.c | 12 ++--- .../gcc.dg/asan/use-after-scope-switch-3.c | 4 +- 10 files changed, 80 insertions(+), 44 deletions(-) diff --git a/gcc/asan.c b/gcc/asan.c index b09d1fc..0f5419f 100644 --- a/gcc/asan.c +++ b/gcc/asan.c @@ -243,15 +243,6 @@ static unsigned HOST_WIDE_INT asan_shadow_offset_value; static bool asan_shadow_offset_computed; static vec sanitized_sections; -/* Return true if STMT is ASAN_MARK poisoning internal function call. */ -static inline bool -asan_mark_poison_p (gimple *stmt) -{ - return (gimple_call_internal_p (stmt, IFN_ASAN_MARK) - && tree_to_uhwi (gimple_call_arg (stmt, 0)) == ASAN_MARK_CLOBBER); - -} - /* Set of variable declarations that are going to be guarded by use-after-scope sanitizer. */ @@ -302,6 +293,13 @@ set_sanitized_sections (const char *sections) } bool +asan_mark_p (gimple *stmt, enum asan_mark_flags flag) +{ + return (gimple_call_internal_p (stmt, IFN_ASAN_MARK) + && tree_to_uhwi (gimple_call_arg (stmt, 0)) == flag); +} + +bool asan_sanitize_stack_p (void) { return ((flag_sanitize & SANITIZE_ADDRESS) @@ -2219,7 +2217,8 @@ transform_statements (void) miss some instrumentation opportunities. Do the same for a ASAN_MARK poisoning internal function. */ if (is_gimple_call (s) - && (!nonfreeing_call_p (s) || asan_mark_poison_p (s))) + && (!nonfreeing_call_p (s) + || asan_mark_p (s, ASAN_MARK_POISON))) empty_mem_ref_hash_table (); gsi_next (&i); @@ -2715,9 +2714,8 @@ asan_expand_mark_ifn (gimple_stmt_iterator *iter) { gimple *g = gsi_stmt (*iter); location_t loc = gimple_location (g); - HOST_WIDE_INT flags = tree_to_shwi (gimple_call_arg (g, 0)); - gcc_assert (flags < ASAN_MARK_LAST); - bool is_clobber = (flags & ASAN_MARK_CLOBBER) != 0; + HOST_WIDE_INT flag = tree_to_shwi (gimple_call_arg (g, 0)); + bool is_poison = ((asan_mark_flags)flag) == ASAN_MARK_POISON; tree base = gimple_call_arg (g, 1); gcc_checking_assert (TREE_CODE (base) == ADDR_EXPR); @@ -2759,7 +2757,7 @@ asan_expand_mark_ifn (gimple_stmt_iterator *iter) if (s > size_in_bytes) last_chunk_size = ASAN_SHADOW_GRANULARITY - (s - size_in_bytes); - asan_store_shadow_bytes (iter, loc, shadow, offset, is_clobber, + asan_store_shadow_bytes (iter, loc, shadow, offset, is_poison, size, last_chunk_size); offset += size; } @@ -2772,7 +2770,7 @@ 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_clobber ? BUILT_IN_ASAN_CLOBBER_N + tree fun = builtin_decl_implicit (is_poison ? BUILT_IN_ASAN_CLOBBER_N : BUILT_IN_ASAN_UNCLOBBER_N); g = gimple_build_call (fun, 2, base_addr, sz_arg); gimple_set_location (g, loc); diff --git a/gcc/asan.h b/gcc/asan.h index 214318e..86b2955 100644 --- a/gcc/asan.h +++ b/gcc/asan.h @@ -75,13 +75,18 @@ enum asan_check_flags }; /* Flags for Asan check builtins. */ +#define IFN_ASAN_MARK_FLAGS DEF(POISON), DEF(UNPOISON) + enum asan_mark_flags { - ASAN_MARK_CLOBBER = 1 << 0, - ASAN_MARK_UNCLOBBER = 1 << 1, - ASAN_MARK_LAST = 1 << 2 +#define DEF(X) ASAN_MARK_##X + IFN_ASAN_MARK_FLAGS +#undef DEF }; +/* Return true if STMT is ASAN_MARK with FLAG as first argument. */ +extern bool asan_mark_p (gimple *stmt, enum asan_mark_flags flag); + /* Return the size of padding needed to insert after a protected decl of SIZE. */ diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c index 0353829..ed4c303 100644 --- a/gcc/gimple-pretty-print.c +++ b/gcc/gimple-pretty-print.c @@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. If not see #include "dumpfile.h" /* for dump_flags */ #include "value-prof.h" #include "trans-mem.h" +#include "asan.h" #define INDENT(SPACE) \ do { int i; for (i = 0; i < SPACE; i++) pp_space (buffer); } while (0) @@ -581,22 +582,54 @@ dump_gimple_return (pretty_printer *buffer, greturn *gs, int spc, int flags) static void dump_gimple_call_args (pretty_printer *buffer, gcall *gs, int flags) { - size_t i; + size_t i = 0; - for (i = 0; i < gimple_call_num_args (gs); i++) + /* Pretty print first arg to certain internal fns. */ + if (gimple_call_internal_p (gs)) { - dump_generic_node (buffer, gimple_call_arg (gs, i), 0, flags, false); - if (i < gimple_call_num_args (gs) - 1) + const char *const *enums = NULL; + unsigned limit = 0; + + switch (gimple_call_internal_fn (gs)) + { + case IFN_ASAN_MARK: +#define DEF(X) #X + static const char *const asan_mark_args[] = {IFN_ASAN_MARK_FLAGS}; +#undef DEF + enums = asan_mark_args; + limit = ARRAY_SIZE (asan_mark_args); + break; + + default: + break; + } + if (limit) + { + tree arg0 = gimple_call_arg (gs, 0); + HOST_WIDE_INT v; + + if (TREE_CODE (arg0) == INTEGER_CST + && tree_fits_shwi_p (arg0) + && (v = tree_to_shwi (arg0)) >= 0 && v < limit) + { + i++; + pp_string (buffer, enums[v]); + } + } + } + + + for (; i < gimple_call_num_args (gs); i++) + { + if (i) pp_string (buffer, ", "); + dump_generic_node (buffer, gimple_call_arg (gs, i), 0, flags, false); } if (gimple_call_va_arg_pack_p (gs)) { - if (gimple_call_num_args (gs) > 0) - { - pp_comma (buffer); - pp_space (buffer); - } + if (i) + pp_string (buffer, ", "); pp_string (buffer, "__builtin_va_arg_pack ()"); } diff --git a/gcc/gimple.c b/gcc/gimple.c index 973bcd7..de8fa45 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -2626,7 +2626,7 @@ nonfreeing_call_p (gimple *call) case IFN_ABNORMAL_DISPATCHER: return true; case IFN_ASAN_MARK: - return tree_to_uhwi (gimple_call_arg (call, 0)) == ASAN_MARK_UNCLOBBER; + return tree_to_uhwi (gimple_call_arg (call, 0)) == ASAN_MARK_UNPOISON; default: if (gimple_call_flags (call) & ECF_LEAF) return true; diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 673738c..b8928d3 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -1102,7 +1102,7 @@ build_asan_poison_call_expr (tree decl) return build_call_expr_internal_loc (UNKNOWN_LOCATION, IFN_ASAN_MARK, void_type_node, 3, build_int_cst (integer_type_node, - ASAN_MARK_CLOBBER), + ASAN_MARK_POISON), base, unit_size); } @@ -1131,7 +1131,7 @@ asan_poison_variable (tree decl, bool poison, gimple_stmt_iterator *it, if (DECL_ALIGN_UNIT (decl) <= ASAN_SHADOW_GRANULARITY) SET_DECL_ALIGN (decl, BITS_PER_UNIT * ASAN_SHADOW_GRANULARITY); - HOST_WIDE_INT flags = poison ? ASAN_MARK_CLOBBER : ASAN_MARK_UNCLOBBER; + HOST_WIDE_INT flags = poison ? ASAN_MARK_POISON : ASAN_MARK_UNPOISON; gimple *g = gimple_build_call_internal (IFN_ASAN_MARK, 3, diff --git a/gcc/testsuite/gcc.dg/asan/use-after-scope-goto-1.c b/gcc/testsuite/gcc.dg/asan/use-after-scope-goto-1.c index c47a5e8..c1538e4 100644 --- a/gcc/testsuite/gcc.dg/asan/use-after-scope-goto-1.c +++ b/gcc/testsuite/gcc.dg/asan/use-after-scope-goto-1.c @@ -42,6 +42,6 @@ int main(int argc, char **argv) return 0; } -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &a, 4\\);" 2 "asan0" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &c, 4\\);" 2 "asan0" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &e, 4\\);" 2 "asan0" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &a, 4\\);" 2 "asan0" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &c, 4\\);" 2 "asan0" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &e, 4\\);" 2 "asan0" } } */ diff --git a/gcc/testsuite/gcc.dg/asan/use-after-scope-goto-2.c b/gcc/testsuite/gcc.dg/asan/use-after-scope-goto-2.c index 73ef4e0..7c39614 100644 --- a/gcc/testsuite/gcc.dg/asan/use-after-scope-goto-2.c +++ b/gcc/testsuite/gcc.dg/asan/use-after-scope-goto-2.c @@ -22,4 +22,4 @@ int main(int argc, char **argv) return 0; } -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &a, 4\\);" 1 "asan0" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &a, 4\\);" 1 "asan0" } } */ diff --git a/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-1.c b/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-1.c index a834268..d4d7539 100644 --- a/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-1.c +++ b/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-1.c @@ -21,5 +21,5 @@ main (int argc, char **argv) return 0; } -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &a, \[0-9\]\\);" 2 "gimple" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(1, &a, \[0-9\]\\);" 1 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &a, \[0-9\]\\);" 2 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(POISON, &a, \[0-9\]\\);" 1 "gimple" } } */ diff --git a/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-2.c b/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-2.c index 8aeca5a..5a5ea37 100644 --- a/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-2.c +++ b/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-2.c @@ -25,9 +25,9 @@ main (int argc, char **argv) return 0; } -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &a, \[0-9\]\\);" 2 "gimple" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &b, \[0-9\]\\);" 2 "gimple" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &c, \[0-9\]\\);" 2 "gimple" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(1, &a, \[0-9\]\\);" 1 "gimple" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(1, &b, \[0-9\]\\);" 1 "gimple" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(1, &c, \[0-9\]\\);" 1 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &a, \[0-9\]\\);" 2 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &b, \[0-9\]\\);" 2 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &c, \[0-9\]\\);" 2 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(POISON, &a, \[0-9\]\\);" 1 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(POISON, &b, \[0-9\]\\);" 1 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(POISON, &c, \[0-9\]\\);" 1 "gimple" } } */ diff --git a/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-3.c b/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-3.c index 828cb7c..f361591 100644 --- a/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-3.c +++ b/gcc/testsuite/gcc.dg/asan/use-after-scope-switch-3.c @@ -32,5 +32,5 @@ main (int argc, char **argv) return 0; } -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(2, &a, \[0-9\]\\);" 4 "gimple" } } */ -/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(1, &a, \[0-9\]\\);" 1 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(UNPOISON, &a, \[0-9\]\\);" 4 "gimple" } } */ +/* { dg-final { scan-tree-dump-times "ASAN_MARK \\(POISON, &a, \[0-9\]\\);" 1 "gimple" } } */ -- 2.7.4