diff options
| author | Patrick Palka <ppalka@gcc.gnu.org> | 2016-01-16 02:37:09 +0000 |
|---|---|---|
| committer | Patrick Palka <ppalka@gcc.gnu.org> | 2016-01-16 02:37:09 +0000 |
| commit | ec7886c19b5853d27c37cfb269f70805e4296231 (patch) | |
| tree | a034319e48216378ff232cd782888a7ce4ebf446 | |
| parent | 203484bb27d092dde0f91bf50ce6bc541f1e5dfe (diff) | |
| download | gcc-ec7886c19b5853d27c37cfb269f70805e4296231.zip gcc-ec7886c19b5853d27c37cfb269f70805e4296231.tar.gz gcc-ec7886c19b5853d27c37cfb269f70805e4296231.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/pr69091.C | 25 |
4 files changed, 41 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 91b92a8..6b7e81b0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,12 @@ 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 error_mark_node only if find_rank failed, not if it was successful. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index edec774..403c5ac 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 e21aad4..82810dd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 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 dump does not contain an error_mark_node. * c-c++-common/cilk-plus/CK/pr60469.c: Likewise. diff --git a/gcc/testsuite/g++.dg/template/pr69091.C b/gcc/testsuite/g++.dg/template/pr69091.C new file mode 100644 index 0000000..ec7bb25 --- /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; +} |