From: Patrick Palka <ppalka@gcc.gnu.org>
Date: Sat, 16 Jan 2016 02:37:09 +0000 (+0000)
Subject: Fix PR c++/69091 (ICE with operator overload having 'auto' return type)
X-Git-Tag: basepoints/gcc-7~1572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec7886c19b5853d27c37cfb269f70805e4296231;p=thirdparty%2Fgcc.git

Fix PR c++/69091 (ICE with operator overload having 'auto' return type)

gcc/cp/ChangeLog:

	PR c++/69091
	* pt.c (type_dependent_expression_p): For a function template
	specialization, a type is dependent iff any of its template
	arguments are.

gcc/testsuite/ChangeLog:

	PR c++/69091
	* g++.dg/template/pr69091.C: New test.

From-SVN: r232463
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 91b92a8b82cf..6b7e81b07337 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-16  Patrick Palka  <ppalka@gcc.gnu.org>
+
+	PR c++/69091
+	* pt.c (type_dependent_expression_p): For a function template
+	specialization, a type is dependent iff any of its template
+	arguments are.
+
 2016-01-16  Patrick Palka  <ppalka@gcc.gnu.org>
 
 	* cp-array-notation.c (cp_expand_cond_array_notations): Return
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index edec774a0c96..403c5ac0bea8 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -22759,12 +22759,12 @@ type_dependent_expression_p (tree expression)
 	      || dependent_scope_p (scope));
     }
 
+  /* A function template specialization is type-dependent if it has any
+     dependent template arguments.  */
   if (TREE_CODE (expression) == FUNCTION_DECL
       && DECL_LANG_SPECIFIC (expression)
-      && DECL_TEMPLATE_INFO (expression)
-      && (any_dependent_template_arguments_p
-	  (INNERMOST_TEMPLATE_ARGS (DECL_TI_ARGS (expression)))))
-    return true;
+      && DECL_TEMPLATE_INFO (expression))
+    return any_dependent_template_arguments_p (DECL_TI_ARGS (expression));
 
   if (TREE_CODE (expression) == TEMPLATE_DECL
       && !DECL_TEMPLATE_TEMPLATE_PARM_P (expression))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e21aad44ca6b..82810dd6aeb3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-16  Patrick Palka  <ppalka@gcc.gnu.org>
+
+	PR c++/69091
+	* g++.dg/template/pr69091.C: New test.
+
 2016-01-16  Patrick Palka  <ppalka@gcc.gnu.org>
 
 	* c-c++-common/cilk-plus/AN/an-if.c: Check that the original
diff --git a/gcc/testsuite/g++.dg/template/pr69091.C b/gcc/testsuite/g++.dg/template/pr69091.C
new file mode 100644
index 000000000000..ec7bb2569124
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/pr69091.C
@@ -0,0 +1,25 @@
+// PR c++/69091
+// { dg-do compile { target c++14 } }
+
+template <class ValueType, ValueType>
+struct Option {};
+
+template <class ValueType, ValueType Value, class OptionsRhs>
+auto operator|(Option<ValueType, Value>, OptionsRhs) {
+  return Value;
+}
+
+enum canine_t { no, yes };
+Option<canine_t, no> cat;
+Option<canine_t, yes> dog;
+
+template <class T>
+void f(T) {
+  cat | dog;
+}
+
+struct A {};
+int main() {
+  f(A{});
+  return 0;
+}