From d168b3daa6f5aad0f5d57b9ac814dcd6e8243c61 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 17 Nov 2016 16:40:41 -0500
Subject: [PATCH] PR c++/68377 - parenthesized expr in fold-expression

	* parser.c (cp_parser_fold_expression): Check TREE_NO_WARNING.

From-SVN: r242561
---
 gcc/cp/ChangeLog                   |  5 +++++
 gcc/cp/parser.c                    |  4 +++-
 gcc/testsuite/g++.dg/cpp1z/fold8.C | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp1z/fold8.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 088a63cab84..5775ba64ac4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-17  Jason Merrill  <jason@redhat.com>
+
+	PR c++/68377
+	* parser.c (cp_parser_fold_expression): Check TREE_NO_WARNING.
+
 2016-11-16  Jason Merrill  <jason@redhat.com>
 
 	PR c++/78373
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 9a5039f9955..3ab0b686532 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -4679,7 +4679,9 @@ cp_parser_fold_expression (cp_parser *parser, tree expr1)
   /* The operands of a fold-expression are cast-expressions, so binary or
      conditional expressions are not allowed.  We check this here to avoid
      tentative parsing.  */
-  if (is_binary_op (TREE_CODE (expr1)))
+  if (EXPR_P (expr1) && TREE_NO_WARNING (expr1))
+    /* OK, the expression was parenthesized.  */;
+  else if (is_binary_op (TREE_CODE (expr1)))
     error_at (location_of (expr1),
 	      "binary expression in operand of fold-expression");
   else if (TREE_CODE (expr1) == COND_EXPR)
diff --git a/gcc/testsuite/g++.dg/cpp1z/fold8.C b/gcc/testsuite/g++.dg/cpp1z/fold8.C
new file mode 100644
index 00000000000..e27db7a5dcf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/fold8.C
@@ -0,0 +1,15 @@
+// PR c++/68377
+// { dg-options -std=c++1z }
+
+struct Sink { } s;
+template <class T> Sink& operator<<(Sink&, const T&);
+
+template<class... Tx> 
+int f(Tx... xs) {
+  return ((xs+1) + ...);
+}
+
+int main() {
+  s << f(3,4,5) << "\n";
+  return 0;
+}