diff options
author | Gabriel Dos Reis <gdr@integrable-solutions.net> | 2013-08-05 05:16:29 +0000 |
---|---|---|
committer | Gabriel Dos Reis <gdr@gcc.gnu.org> | 2013-08-05 05:16:29 +0000 |
commit | 11a877b33a138cc5218b7ea01698175847f8d836 (patch) | |
tree | 66d156e4c15970331873eca8199a453d6723e963 | |
parent | b066401f2654cca7577a6de6d6d4c38701549571 (diff) | |
download | gcc-11a877b33a138cc5218b7ea01698175847f8d836.zip gcc-11a877b33a138cc5218b7ea01698175847f8d836.tar.gz gcc-11a877b33a138cc5218b7ea01698175847f8d836.tar.bz2 |
asan.c (asan_pp): Remove.
* asan.c (asan_pp): Remove.
(asan_pp_initialized): Likewise.
(asan_pp_initialize): Likewise.
(asan_pp_string): Take a pretty_printer parameter. Adjust callers.
(asan_emit_stack_protection): Tidy. Use local pretty printer.
(asan_add_global): Likewise.
From-SVN: r201480
-rw-r--r-- | gcc/ChangeLog | 9 | ||||
-rw-r--r-- | gcc/asan.c | 33 |
2 files changed, 19 insertions, 23 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0c8a9d1..8d5c5fa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2013-08-05 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * asan.c (asan_pp): Remove. + (asan_pp_initialized): Likewise. + (asan_pp_initialize): Likewise. + (asan_pp_string): Take a pretty_printer parameter. Adjust callers. + (asan_emit_stack_protection): Tidy. Use local pretty printer. + (asan_add_global): Likewise. + 2013-08-04 Gabriel Dos Reis <gdr@integrable-solutions.net> * pretty-print.h (pp_base): Remove. Adjust dependent macros. @@ -842,25 +842,12 @@ asan_init_shadow_ptr_types (void) initialize_sanitizer_builtins (); } -/* Asan pretty-printer, used for buidling of the description STRING_CSTs. */ -static pretty_printer asan_pp; -static bool asan_pp_initialized; - -/* Initialize asan_pp. */ - -static void -asan_pp_initialize (void) -{ - pp_construct (&asan_pp, /* prefix */NULL, /* line-width */0); - asan_pp_initialized = true; -} - -/* Create ADDR_EXPR of STRING_CST with asan_pp text. */ +/* Create ADDR_EXPR of STRING_CST with the PP pretty printer text. */ static tree -asan_pp_string (void) +asan_pp_string (pretty_printer *pp) { - const char *buf = pp_formatted_text (&asan_pp); + const char *buf = pp_formatted_text (pp); size_t len = strlen (buf); tree ret = build_string (len + 1, buf); TREE_TYPE (ret) @@ -950,9 +937,9 @@ asan_emit_stack_protection (rtx base, HOST_WIDE_INT *offsets, tree *decls, asan_init_shadow_ptr_types (); /* First of all, prepare the description string. */ - if (!asan_pp_initialized) - asan_pp_initialize (); - + pretty_printer asan_pp; + pp_construct (&asan_pp, /* prefix */NULL, /* line-width */0); + pp_clear_output_area (&asan_pp); if (DECL_NAME (current_function_decl)) pp_tree_identifier (&asan_pp, DECL_NAME (current_function_decl)); @@ -978,7 +965,7 @@ asan_emit_stack_protection (rtx base, HOST_WIDE_INT *offsets, tree *decls, pp_string (&asan_pp, "9 <unknown>"); pp_space (&asan_pp); } - str_cst = asan_pp_string (); + str_cst = asan_pp_string (&asan_pp); /* Emit the prologue sequence. */ base = expand_binop (Pmode, add_optab, base, GEN_INT (base_offset), @@ -1976,8 +1963,8 @@ asan_add_global (tree decl, tree type, vec<constructor_elt, va_gc> *v) tree str_cst, refdecl = decl; vec<constructor_elt, va_gc> *vinner = NULL; - if (!asan_pp_initialized) - asan_pp_initialize (); + pretty_printer asan_pp; + pp_construct (&asan_pp, /* prefix */NULL, /* line-width */0); pp_clear_output_area (&asan_pp); if (DECL_NAME (decl)) @@ -1988,7 +1975,7 @@ asan_add_global (tree decl, tree type, vec<constructor_elt, va_gc> *v) pp_left_paren (&asan_pp); pp_string (&asan_pp, main_input_filename); pp_right_paren (&asan_pp); - str_cst = asan_pp_string (); + str_cst = asan_pp_string (&asan_pp); if (asan_needs_local_alias (decl)) { |