re PR c++/83204 (c++ -std=c++14 ICE in maybe_undo_parenthesized_ref, at cp/semantics...

/cp
2018-02-08  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/83204
	* pt.c (tsubst_copy_and_build): Use force_paren_expr for INDIRECT_REF.

/testsuite
2018-02-08  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/83204
	* g++.dg/cpp0x/lambda/lambda-ice25.C: New.

From-SVN: r257478

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0b710e9140fc9383b12ecd85062cd8a60feceeba..b898ba15a37e8e8645704f0b48675487d0a51fb9 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/83204
+       * pt.c (tsubst_copy_and_build): Use force_paren_expr for INDIRECT_REF.
+
 2018-02-07  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/84082

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 0d9e153b5ee7723575a1311f5cb4501382bfabb5..a9e4770152734029170156130a65975039881f98 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -17224,8 +17224,8 @@ tsubst_copy_and_build (tree t,
          r = build_x_indirect_ref (input_location, r, RO_UNARY_STAR,
                                    complain|decltype_flag);
 
-       if (TREE_CODE (r) == INDIRECT_REF)
-         REF_PARENTHESIZED_P (r) = REF_PARENTHESIZED_P (t);
+       if (REF_PARENTHESIZED_P (t))
+         r = force_paren_expr (r);
 
        RETURN (r);
       }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 22ec5d18eb6d760dc07f55ae0c6f2ca4b12e05a9..16f2b1a952260b0389b87642279d6bed77b93690 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-08  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/83204
+       * g++.dg/cpp0x/lambda/lambda-ice25.C: New.
+
 2018-02-07  Will Schmidt  <will_schmidt@vnet.ibm.com>
 
        * gcc.target/powerpc/vsxcopy.c: Update scan-assembler stanzas.

diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice25.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice25.C
new file mode 100644 (file)
index 0000000..1a33fb1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice25.C
@@ -0,0 +1,27 @@
+// PR c++/83204
+// { dg-do compile { target c++11 } }
+
+int rand();
+
+template<typename T>
+struct s
+{
+    int count() { return rand(); }
+};
+
+template<typename v>
+void f(s<v> a)
+{
+    int const x = a.count();
+    int r = 0;
+    auto l = [&](int& r)
+    {
+        for(int y = 0, yend = (x); y < yend; ++y)
+        {
+            r += y;
+        }
+    };
+    l(r);
+}
+
+template void f(s<float>);