aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Jambor <mjambor@suse.cz>2016-01-27 15:51:17 +0100
committerMartin Jambor <jamborm@gcc.gnu.org>2016-01-27 15:51:17 +0100
commit1430fb1f563dd7434b262d1b1378d9954d13dc0c (patch)
tree012821f0ad0170ef99cb15e2364a2a8648984a58 /gcc
parent95e3030cfa307191f87da77bb98b101f2ed88bec (diff)
downloadgcc-1430fb1f563dd7434b262d1b1378d9954d13dc0c.zip
gcc-1430fb1f563dd7434b262d1b1378d9954d13dc0c.tar.gz
gcc-1430fb1f563dd7434b262d1b1378d9954d13dc0c.tar.bz2
[PR 69355] Correct hole detection when total_scalarization fails
2016-01-27 Martin Jambor <mjambor@suse.cz> PR tree-optimization/69355 * tree-sra.c (analyze_access_subtree): Correct hole detection when total_scalarization fails. testsuite/ * gcc.dg/tree-ssa/pr69355.c: New test. From-SVN: r232877
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/tree-ssa/pr69355.c44
-rw-r--r--gcc/tree-sra.c2
4 files changed, 56 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2dbdd29..824c69c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-27 Martin Jambor <mjambor@suse.cz>
+
+ PR tree-optimization/69355
+ * tree-sra.c (analyze_access_subtree): Correct hole detection when
+ total_scalarization fails.
+
2016-01-27 David Edelsohn <dje.gcc@gmail.com>
* config/rs6000/driver-rs6000.c (detect_processor_aix): Add
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2ff4f7d..7dae86c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-27 Martin Jambor <mjambor@suse.cz>
+
+ PR tree-optimization/69355
+ * gcc.dg/tree-ssa/pr69355.c: New test.
+
2016-01-27 Marek Polacek <polacek@redhat.com>
PR c++/69496
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr69355.c b/gcc/testsuite/gcc.dg/tree-ssa/pr69355.c
new file mode 100644
index 0000000..f515c21
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr69355.c
@@ -0,0 +1,44 @@
+/* { dg-do run } */
+/* { dg-options "-O -fno-strict-aliasing" } */
+
+struct S
+{
+ void *a;
+ long double b;
+};
+
+struct Z
+{
+ long long l;
+ short s;
+} __attribute__((packed));
+
+struct S __attribute__((noclone, noinline))
+foo (void *v, struct Z *z)
+{
+ struct S t;
+ t.a = v;
+ *(struct Z *) &t.b = *z;
+ return t;
+}
+
+struct Z gz;
+
+int
+main (int argc, char **argv)
+{
+ struct S s;
+
+ if (sizeof (long double) < sizeof (struct Z))
+ return 0;
+
+ gz.l = 0xbeef;
+ gz.s = 0xab;
+
+ s = foo ((void *) 0, &gz);
+
+ if ((((struct Z *) &s.b)->l != gz.l)
+ || (((struct Z *) &s.b)->s != gz.s))
+ __builtin_abort ();
+ return 0;
+}
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 30a8244..72157ed 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -2421,7 +2421,7 @@ analyze_access_subtree (struct access *root, struct access *parent,
if (covered_to < limit)
hole = true;
- if (scalar)
+ if (scalar || !allow_replacements)
root->grp_total_scalarization = 0;
}