From: rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 5 Apr 2016 14:26:59 +0000 (+0000)
Subject: 2016-04-05  Richard Biener  <rguenther@suse.de>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eec3b789dfd4003112586e1e235431b77bdfec44;p=thirdparty%2Fgcc.git

2016-04-05  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/70526
	* tree-sra.c (build_ref_for_offset): Use prev_base to
	extract the alias pointer type.

	* g++.dg/torture/pr70526.C: New testcase.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234749 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index abd195dc4df0..b7fc0cd9d065 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-05  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/70526
+	* tree-sra.c (build_ref_for_offset): Use prev_base to
+	extract the alias pointer type.
+
 2016-04-05  Richard Biener  <rguenther@suse.de>
 
 	* dse.c (struct store_info): Remove alias_set member.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f3d1a6e69198..fcb5222a1edc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-05  Richard Biener  <rguenther@suse.de>
+
+	PR tree-optimization/70526
+	* g++.dg/torture/pr70526.C: New testcase.
+
 2016-04-05  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/70525
diff --git a/gcc/testsuite/g++.dg/torture/pr70526.C b/gcc/testsuite/g++.dg/torture/pr70526.C
new file mode 100644
index 000000000000..37a3e5f5a495
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr70526.C
@@ -0,0 +1,35 @@
+// { dg-do run }
+
+typedef unsigned uint32_t;
+
+template<typename T>
+struct AlignedStorage2
+{
+  char mBytes[sizeof(T)];
+
+  const T* addr() const { return reinterpret_cast<const T*>(mBytes); }
+  T* addr() { return reinterpret_cast<T*>(mBytes); }
+};
+
+struct Register {
+    uint32_t reg_;
+};
+
+class TypedOrValueRegister
+{
+  AlignedStorage2<Register> typed;
+  __attribute__((noinline)) Register& dataTyped() { return *typed.addr(); }
+public:
+  TypedOrValueRegister(Register reg)
+    {
+      dataTyped() = reg;
+    }
+  Register typedReg() const { return *typed.addr(); }
+};
+
+int main() {
+    Register reg = { 10u };
+    if (TypedOrValueRegister(reg).typedReg().reg_ != 10)
+      __builtin_abort();
+    return 0;
+}
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index a3fb59ce5a4c..738c1a77bda5 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -1673,7 +1673,7 @@ build_ref_for_offset (location_t loc, tree base, HOST_WIDE_INT offset,
     }
   else
     {
-      off = build_int_cst (reference_alias_ptr_type (base),
+      off = build_int_cst (reference_alias_ptr_type (prev_base),
 			   base_offset + offset / BITS_PER_UNIT);
       base = build_fold_addr_expr (unshare_expr (base));
     }