aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/tree-ssa/pr93845.C30
-rw-r--r--gcc/tree-sra.c3
4 files changed, 43 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1845563..d0c9f29 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-21 Martin Jambor <mjambor@suse.cz>
+
+ PR tree-optimization/93845
+ * tree-sra.c (verify_sra_access_forest): Only test access size of
+ scalar types.
+
2020-02-21 Andrew Stubbs <ams@codesourcery.com>
* config/gcn/gcn.c (gcn_hard_regno_mode_ok): Align VGPR pairs.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8518061..ad4f435 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-21 Martin Jambor <mjambor@suse.cz>
+
+ PR tree-optimization/93845
+ * g++.dg/tree-ssa/pr93845.C: New test.
+
2020-02-21 Richard Sandiford <richard.sandiford@arm.com>
* gcc.target/aarch64/sve/rsqrt_1.c: New test.
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr93845.C b/gcc/testsuite/g++.dg/tree-ssa/pr93845.C
new file mode 100644
index 0000000..72e473f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr93845.C
@@ -0,0 +1,30 @@
+/* { dg-do compile } */
+/* { dg-options "-O1" } */
+
+struct g;
+struct h {
+ g *operator->();
+};
+class i {
+ void *a;
+ int b;
+
+public:
+ template <typename f> f j() { return *static_cast<f *>(this); }
+};
+struct k : i {};
+struct l : k {};
+struct m {
+ i n();
+ i o(l, l, int);
+};
+struct g {
+ void m_fn4(k);
+};
+h a;
+i b;
+i m::n() {
+ l c, d, e = o(d, c, 0).j<l>();
+ a->m_fn4(e);
+ return b;
+}
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 49f9001..5561ea6 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -2355,7 +2355,8 @@ verify_sra_access_forest (struct access *root)
gcc_assert (offset == access->offset);
gcc_assert (access->grp_unscalarizable_region
|| size == max_size);
- gcc_assert (max_size == access->size);
+ gcc_assert (!is_gimple_reg_type (access->type)
+ || max_size == access->size);
gcc_assert (reverse == access->reverse);
if (access->first_child)