aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-ssa-sccvn.c
diff options
context:
space:
mode:
authorRichard Biener <rguenther@suse.de>2017-11-24 09:40:40 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2017-11-24 09:40:40 +0000
commit6a248fce5694ba4304f692a5ebeff0bb965e40a2 (patch)
treedf42271519e4d9837d766d5e0ce881abc165e6f8 /gcc/tree-ssa-sccvn.c
parent97e1c8786bdb4e54520d9135f8ec378237872dbb (diff)
downloadgcc-6a248fce5694ba4304f692a5ebeff0bb965e40a2.zip
gcc-6a248fce5694ba4304f692a5ebeff0bb965e40a2.tar.gz
gcc-6a248fce5694ba4304f692a5ebeff0bb965e40a2.tar.bz2
re PR tree-optimization/83128 (Unable to optimize {m,c}alloc when strings builtin are used)
2017-11-24 Richard Biener <rguenther@suse.de> PR tree-optimization/83128 * tree-ssa-sccvn.c (fully_constant_vn_reference_p): Handle STRING_CSTs. (vn_reference_lookup_3): Likewise. * gcc.dg/tree-ssa/ssa-fre-62.c: New testcase. From-SVN: r255136
Diffstat (limited to 'gcc/tree-ssa-sccvn.c')
-rw-r--r--gcc/tree-ssa-sccvn.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index d0ff301..63a3db9 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -1388,10 +1388,14 @@ fully_constant_vn_reference_p (vn_reference_t ref)
else if (base->opcode == MEM_REF
&& base[1].opcode == ADDR_EXPR
&& (TREE_CODE (TREE_OPERAND (base[1].op0, 0)) == VAR_DECL
- || TREE_CODE (TREE_OPERAND (base[1].op0, 0)) == CONST_DECL))
+ || TREE_CODE (TREE_OPERAND (base[1].op0, 0)) == CONST_DECL
+ || TREE_CODE (TREE_OPERAND (base[1].op0, 0)) == STRING_CST))
{
decl = TREE_OPERAND (base[1].op0, 0);
- ctor = ctor_for_folding (decl);
+ if (TREE_CODE (decl) == STRING_CST)
+ ctor = decl;
+ else
+ ctor = ctor_for_folding (decl);
}
if (ctor == NULL_TREE)
return build_zero_cst (ref->type);
@@ -2331,7 +2335,8 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_,
rhs = TREE_OPERAND (tem, 0);
rhs_offset += tree_to_uhwi (TREE_OPERAND (tem, 1));
}
- else if (DECL_P (tem))
+ else if (DECL_P (tem)
+ || TREE_CODE (tem) == STRING_CST)
rhs = build_fold_addr_expr (tem);
else
return (void *)-1;