[PATCH 1/2] middle-end/94216 fix another build_fold_addr_expr use

[Richard Biener]

Bootstrapped on x86_64-unknown-linux-gnu, testing in progress.

Richard.

2020-03-19  Richard Biener  <rguent...@suse.de>

        PR middle-end/94216
        * fold-const.c (fold_binary_loc): Avoid using
        build_fold_addr_expr when we really want an ADDR_EXPR.

        * g++.dg/torture/pr94216.C: New testcase.
---
 gcc/fold-const.c                       |  2 +-
 gcc/testsuite/g++.dg/torture/pr94216.C | 45 ++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/torture/pr94216.C

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 3ab1a9adcdf..92679142f04 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -10284,7 +10284,7 @@ fold_binary_loc (location_t loc, enum tree_code code, 
tree type,
          if (!base)
            return NULL_TREE;
          return fold_build2 (MEM_REF, type,
-                             build_fold_addr_expr (base),
+                             build1 (ADDR_EXPR, TREE_TYPE (arg0), base),
                              int_const_binop (PLUS_EXPR, arg1,
                                               size_int (coffset)));
        }
diff --git a/gcc/testsuite/g++.dg/torture/pr94216.C 
b/gcc/testsuite/g++.dg/torture/pr94216.C
new file mode 100644
index 00000000000..e67239de98d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr94216.C
@@ -0,0 +1,45 @@
+// { dg-do compile }
+// { dg-additional-options "-g" }
+
+template <int _Nm> struct A { typedef int _Type[_Nm]; };
+template <int _Nm> struct B {
+    typename A<_Nm>::_Type _M_elems;
+    void operator[](int) { int a = *_M_elems; }
+};
+class C {
+    struct D {
+       using type = int *;
+    };
+
+public:
+    using pointer = D::type;
+};
+class F {
+public:
+    using pointer = C::pointer;
+    F(pointer);
+};
+struct G {
+    int data;
+};
+template <int MaxDimensions> struct H {
+    using dimensions_t = B<MaxDimensions>;
+    dimensions_t dimensions;
+    G mem;
+};
+template <int MaxDimensions, typename Allocator, typename DimT, typename 
AlignT>
+H<MaxDimensions> alloc_view(int, DimT, AlignT, Allocator) {
+    H<MaxDimensions> b;
+    b.dimensions[0];
+    return b;
+}
+namespace memory {
+    template <typename> using DynMdView = H<6>;
+}
+class I {
+    I();
+    memory::DynMdView<void> m_view;
+    F m_memory;
+};
+int c, d, e;
+I::I() : m_view(alloc_view<6>(c, d, e, [] {})), m_memory(&m_view.mem.data) {}
-- 
2.16.4