diff options
Diffstat (limited to 'gcc/varasm.c')
| -rw-r--r-- | gcc/varasm.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/gcc/varasm.c b/gcc/varasm.c index 52ba182b00d..e56ca1bbbd5 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -46,7 +46,6 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "common/common-target.h" #include "targhooks.h" -#include "tree-mudflap.h" #include "cgraph.h" #include "pointer-set.h" #include "asan.h" @@ -1247,10 +1246,6 @@ make_decl_rtl (tree decl) && SYMBOL_REF_HAS_BLOCK_INFO_P (XEXP (x, 0))) change_symbol_block (XEXP (x, 0), get_block_for_decl (decl)); - /* Make this function static known to the mudflap runtime. */ - if (flag_mudflap && TREE_CODE (decl) == VAR_DECL) - mudflap_enqueue_decl (decl); - return; } @@ -1387,10 +1382,6 @@ make_decl_rtl (tree decl) If the name is changed, the macro ASM_OUTPUT_LABELREF will have to know how to strip this information. */ targetm.encode_section_info (decl, DECL_RTL (decl), true); - - /* Make this function static known to the mudflap runtime. */ - if (flag_mudflap && TREE_CODE (decl) == VAR_DECL) - mudflap_enqueue_decl (decl); } /* Like make_decl_rtl, but inhibit creation of new alias sets when @@ -1400,7 +1391,7 @@ make_decl_rtl (tree decl) rtx make_decl_rtl_for_debug (tree decl) { - unsigned int save_aliasing_flag, save_mudflap_flag; + unsigned int save_aliasing_flag; rtx rtl; if (DECL_RTL_SET_P (decl)) @@ -1411,12 +1402,9 @@ make_decl_rtl_for_debug (tree decl) we do not want to create alias sets that will throw the alias numbers off in the comparison dumps. So... clearing flag_strict_aliasing will keep new_alias_set() from creating a - new set. It is undesirable to register decl with mudflap - in this case as well. */ + new set. */ save_aliasing_flag = flag_strict_aliasing; flag_strict_aliasing = 0; - save_mudflap_flag = flag_mudflap; - flag_mudflap = 0; rtl = DECL_RTL (decl); /* Reset DECL_RTL back, as various parts of the compiler expects @@ -1424,8 +1412,6 @@ make_decl_rtl_for_debug (tree decl) SET_DECL_RTL (decl, NULL); flag_strict_aliasing = save_aliasing_flag; - flag_mudflap = save_mudflap_flag; - return rtl; } @@ -3206,10 +3192,6 @@ build_constant_desc (tree exp) desc = ggc_alloc_constant_descriptor_tree (); desc->value = copy_constant (exp); - /* Propagate marked-ness to copied constant. */ - if (flag_mudflap && mf_marked_p (exp)) - mf_mark (desc->value); - /* Create a string containing the label name, in LABEL. */ labelno = const_labelno++; ASM_GENERATE_INTERNAL_LABEL (label, "LC", labelno); @@ -3405,8 +3387,6 @@ output_constant_def_contents (rtx symbol) assemble_zeros (asan_red_zone_size (size)); } } - if (flag_mudflap) - mudflap_enqueue_constant (exp); } /* Look up EXP in the table of constant descriptors. Return the rtl @@ -6294,9 +6274,8 @@ categorize_decl_for_section (const_tree decl, int reloc) return SECCAT_TEXT; else if (TREE_CODE (decl) == STRING_CST) { - if (flag_mudflap - || ((flag_sanitize & SANITIZE_ADDRESS) - && asan_protect_global (CONST_CAST_TREE (decl)))) + if ((flag_sanitize & SANITIZE_ADDRESS) + && asan_protect_global (CONST_CAST_TREE (decl))) /* or !flag_merge_constants */ return SECCAT_RODATA; else @@ -6321,7 +6300,7 @@ categorize_decl_for_section (const_tree decl, int reloc) } else if (reloc & targetm.asm_out.reloc_rw_mask ()) ret = reloc == 1 ? SECCAT_DATA_REL_RO_LOCAL : SECCAT_DATA_REL_RO; - else if (reloc || flag_merge_constants < 2 || flag_mudflap + else if (reloc || flag_merge_constants < 2 || ((flag_sanitize & SANITIZE_ADDRESS) && asan_protect_global (CONST_CAST_TREE (decl)))) /* C and C++ don't allow different variables to share the same |