summaryrefslogtreecommitdiff
path: root/gcc/tree-sra.c
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2009-05-10 10:16:01 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2009-05-10 10:16:01 +0000
commit896d7dbd746289b7cdc08505f56860bd73ec5998 (patch)
tree0d1117281776d802a07a6e4630d1ec865cb8cf58 /gcc/tree-sra.c
parenteb74e79b1b2bc2d2d244c8c84a7c7ef293686546 (diff)
downloadgcc-896d7dbd746289b7cdc08505f56860bd73ec5998.tar.gz
re PR tree-optimization/40081 (verify_stmts failed with -O2)
2009-05-10 Richard Guenther <rguenther@suse.de> PR tree-optimization/40081 * tree-sra.c (instantiate_element): Instantiate scalar replacements using the main variant of the element type. Do not fiddle with TREE_THIS_VOLATILE or TREE_SIDE_EFFECTS. * g++.dg/torture/pr40081.C: New testcase. From-SVN: r147330
Diffstat (limited to 'gcc/tree-sra.c')
-rw-r--r--gcc/tree-sra.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index ff8a7399459..03705205319 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -1277,7 +1277,8 @@ instantiate_element (struct sra_elt *elt)
nowarn = TREE_NO_WARNING (base_elt->parent->element);
base = base_elt->element;
- elt->replacement = var = make_rename_temp (elt->type, "SR");
+ elt->replacement = var = make_rename_temp (TYPE_MAIN_VARIANT (elt->type),
+ "SR");
if (DECL_P (elt->element)
&& !tree_int_cst_equal (DECL_SIZE (var), DECL_SIZE (elt->element)))
@@ -1286,7 +1287,8 @@ instantiate_element (struct sra_elt *elt)
DECL_SIZE_UNIT (var) = DECL_SIZE_UNIT (elt->element);
elt->in_bitfld_block = 1;
- elt->replacement = fold_build3 (BIT_FIELD_REF, elt->type, var,
+ elt->replacement = fold_build3 (BIT_FIELD_REF,
+ TYPE_MAIN_VARIANT (elt->type), var,
DECL_SIZE (var),
BYTES_BIG_ENDIAN
? size_binop (MINUS_EXPR,
@@ -1303,12 +1305,6 @@ instantiate_element (struct sra_elt *elt)
DECL_SOURCE_LOCATION (var) = DECL_SOURCE_LOCATION (base);
DECL_ARTIFICIAL (var) = 1;
- if (TREE_THIS_VOLATILE (elt->type))
- {
- TREE_THIS_VOLATILE (var) = 1;
- TREE_SIDE_EFFECTS (var) = 1;
- }
-
if (DECL_NAME (base) && !DECL_IGNORED_P (base))
{
char *pretty_name = build_element_name (elt);