diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-01-23 20:24:32 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-01-23 20:24:32 +0000 |
| commit | 76b0d9e5ef36b57eaaa59dc6fb3fae89f1e15461 (patch) | |
| tree | 022252886d4a452b2871f31e850d84421695283e | |
| parent | 340a24978d9fe1feba6013ebaaacd683ec34f2bc (diff) | |
PR c++/71710 - template using directive of field
* pt.c (tsubst_copy_and_build [COMPONENT_REF]): Move FIELD_DECL
check earlier.
PR C++/71710
* g++.dg/template/pr71710.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244833 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 16 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/pr71710.C | 10 |
4 files changed, 25 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c56c84089f0..66151e9b0a4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2017-01-23 Nathan Sidwell <nathan@acm.org> + PR c++/71710 - template using directive of field + * pt.c (tsubst_copy_and_build [COMPONENT_REF]): Move FIELD_DECL + check earlier. + PR c++/71406 - ICE with scope-ref'd template id exprs PR c++/77508 * typeck.c (finish_class_member_access_expr): Break up SCOPE_REF diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 8c920c36442..537d1073fa0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -17470,7 +17470,14 @@ tsubst_copy_and_build (tree t, if (member == error_mark_node) RETURN (error_mark_node); - if (type_dependent_expression_p (object)) + if (TREE_CODE (member) == FIELD_DECL) + { + r = finish_non_static_data_member (member, object, NULL_TREE); + if (TREE_CODE (r) == COMPONENT_REF) + REF_PARENTHESIZED_P (r) = REF_PARENTHESIZED_P (t); + RETURN (r); + } + else if (type_dependent_expression_p (object)) /* We can't do much here. */; else if (!CLASS_TYPE_P (object_type)) { @@ -17535,13 +17542,6 @@ tsubst_copy_and_build (tree t, } RETURN (error_mark_node); } - else if (TREE_CODE (member) == FIELD_DECL) - { - r = finish_non_static_data_member (member, object, NULL_TREE); - if (TREE_CODE (r) == COMPONENT_REF) - REF_PARENTHESIZED_P (r) = REF_PARENTHESIZED_P (t); - RETURN (r); - } r = finish_class_member_access_expr (object, member, /*template_p=*/false, diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f3ac5e5bd5a..ee1f19ce993 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2017-01-23 Nathan Sidwell <nathan@acm.org> + PR C++/71710 + * g++.dg/template/pr71710.C: New. + PR c++/71406 PR c++/77508 * g++.dg/template/pr71406.C: New. diff --git a/gcc/testsuite/g++.dg/template/pr71710.C b/gcc/testsuite/g++.dg/template/pr71710.C new file mode 100644 index 00000000000..7c394e793b7 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/pr71710.C @@ -0,0 +1,10 @@ +// { dg-do compile { target c++11 } } +// PR C++/71710 ICE with decltype & using + +template < typename > struct A +{ + A a; + template < int > using B = decltype (a); + B < 0 > b; + template < int C > B < C > foo (); +}; |