@@ -1034,7 +1034,8 @@ get_variable_section (tree decl, bool pr
&& !(prefer_noswitch_p && targetm.have_switchable_bss_sections)
&& bss_initializer_p (decl))
{
- if (!TREE_PUBLIC (decl))
+ if (!TREE_PUBLIC (decl)
+ && !(flag_asan && asan_protect_global (decl)))
return lcomm_section;
if (bss_noswitch_section)
return bss_noswitch_section;
@@ -428,7 +428,6 @@ bool
asan_protect_global (tree decl)
{
rtx rtl, symbol;
- section *sect;
if (TREE_CODE (decl) != VAR_DECL
/* TLS vars aren't statically protectable. */
@@ -442,7 +441,7 @@ asan_protect_global (tree decl)
padding or not. */
|| DECL_ONE_ONLY (decl)
/* Similarly for common vars. People can use -fno-common. */
- || DECL_COMMON (decl)
+ || (DECL_COMMON (decl) && TREE_PUBLIC (decl))
/* Don't protect if using user section, often vars placed
into user section from multiple TUs are then assumed
to be an array of such vars, putting padding in there
@@ -464,10 +463,6 @@ asan_protect_global (tree decl)
|| TREE_CONSTANT_POOL_ADDRESS_P (symbol))
return false;
- sect = get_variable_section (decl, false);
- if (sect->common.flags & SECTION_COMMON)
- return false;
-
if (lookup_attribute ("weakref", DECL_ATTRIBUTES (decl)))
return false;