diff options
| author | Tom de Vries <tom@codesourcery.com> | 2011-10-13 09:54:50 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2011-10-13 09:54:50 +0000 |
| commit | ba30e50da297aae475d10e95cd8d391e1e4dde17 (patch) | |
| tree | 632f11e927fc77c78227669b4d1bc7c536ad109b | |
| parent | 6c9fbfa72eea6d4a8689831977bfde2072fc195a (diff) | |
| download | gcc-ba30e50da297aae475d10e95cd8d391e1e4dde17.zip gcc-ba30e50da297aae475d10e95cd8d391e1e4dde17.tar.gz gcc-ba30e50da297aae475d10e95cd8d391e1e4dde17.tar.bz2 | |
emit-rtl.c (set_mem_attributes_minus_bitpos): Set MEM_READONLY_P for static const strings.
2011-10-13 Tom de Vries <tom@codesourcery.com>
* emit-rtl.c (set_mem_attributes_minus_bitpos): Set MEM_READONLY_P
for static const strings.
* varasm.c (build_constant_desc): Generate the memory location of the
constant using gen_const_mem.
From-SVN: r179896
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/emit-rtl.c | 6 | ||||
| -rw-r--r-- | gcc/varasm.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 01d2135..c8c7ef8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-10-13 Tom de Vries <tom@codesourcery.com> + + * emit-rtl.c (set_mem_attributes_minus_bitpos): Set MEM_READONLY_P + for static const strings. + * varasm.c (build_constant_desc): Generate the memory location of the + constant using gen_const_mem. + 2011-10-13 Richard Guenther <rguenther@suse.de> PR tree-optimization/50698 diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c index dae7669..8465237 100644 --- a/gcc/emit-rtl.c +++ b/gcc/emit-rtl.c @@ -1696,6 +1696,12 @@ set_mem_attributes_minus_bitpos (rtx ref, tree t, int objectp, && !TREE_THIS_VOLATILE (base)) MEM_READONLY_P (ref) = 1; + /* Mark static const strings readonly as well. */ + if (base && TREE_CODE (base) == STRING_CST + && TREE_READONLY (base) + && TREE_STATIC (base)) + MEM_READONLY_P (ref) = 1; + /* If this expression uses it's parent's alias set, mark it such that we won't change it. */ if (component_uses_parent_alias_set (t)) diff --git a/gcc/varasm.c b/gcc/varasm.c index 94e3111..d0de213 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -3119,7 +3119,7 @@ build_constant_desc (tree exp) SET_SYMBOL_REF_DECL (symbol, decl); TREE_CONSTANT_POOL_ADDRESS_P (symbol) = 1; - rtl = gen_rtx_MEM (TYPE_MODE (TREE_TYPE (exp)), symbol); + rtl = gen_const_mem (TYPE_MODE (TREE_TYPE (exp)), symbol); set_mem_attributes (rtl, exp, 1); set_mem_alias_set (rtl, 0); set_mem_alias_set (rtl, const_alias_set); |