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 /gcc/cp/pt.c | |
| 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
Diffstat (limited to 'gcc/cp/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 16 |
1 files changed, 8 insertions, 8 deletions
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, |