From 496b0d7690c08dda09947b9edc9cb366cbdec8d2 Mon Sep 17 00:00:00 2001
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 8 Feb 2018 09:06:33 +0000
Subject: [PATCH] /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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@257478 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                                 |  5 +++++
 gcc/cp/pt.c                                      |  4 ++--
 gcc/testsuite/ChangeLog                          |  5 +++++
 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice25.C | 27 ++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-ice25.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0b710e9140f..b898ba15a37 100644
--- 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 0d9e153b5ee..a9e47701527 100644
--- 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 22ec5d18eb6..16f2b1a9522 100644
--- 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
index 00000000000..1a33fb16364
--- /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>);
-- 
2.11.4.GIT