From f9b381b8eb56252e302b88ea4fe89beffc33cf80 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 5 Mar 2014 14:25:37 -0500
Subject: [PATCH] re PR c++/60409 ([c++1y] ICE on valid with template function)

	PR c++/60409
	* semantics.c (force_paren_expr): Only add a PAREN_EXPR to a
	dependent expression.

From-SVN: r208352
---
 gcc/cp/ChangeLog                      |  4 ++++
 gcc/cp/semantics.c                    |  2 +-
 gcc/testsuite/g++.dg/cpp1y/regress1.C | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp1y/regress1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9e7b9b77c9cd..a0b87bf91af8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2014-03-05  Jason Merrill  <jason@redhat.com>
 
+	PR c++/60409
+	* semantics.c (force_paren_expr): Only add a PAREN_EXPR to a
+	dependent expression.
+
 	PR c++/60361
 	* parser.c (cp_parser_template_id): Don't set up a CPP_TEMPLATE_ID
 	if re-parsing might succeed.
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 4081e0ec1d57..d2c453fc658e 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1609,7 +1609,7 @@ force_paren_expr (tree expr)
       && TREE_CODE (expr) != SCOPE_REF)
     return expr;
 
-  if (processing_template_decl)
+  if (type_dependent_expression_p (expr))
     expr = build1 (PAREN_EXPR, TREE_TYPE (expr), expr);
   else
     {
diff --git a/gcc/testsuite/g++.dg/cpp1y/regress1.C b/gcc/testsuite/g++.dg/cpp1y/regress1.C
new file mode 100644
index 000000000000..94b00eb82b65
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/regress1.C
@@ -0,0 +1,12 @@
+// PR c++/60409
+// { dg-options -std=c++1y }
+
+struct A
+{
+  void foo();
+};
+
+template<typename T> void bar(T)
+{
+  (A().foo)();
+}
-- 
2.47.2