diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-11-07 22:03:27 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-11-07 22:03:27 +0000 |
| commit | 5a0626d162e8c3a29b48872336ebc1b51cf26c43 (patch) | |
| tree | 9153c8c86b46784b2864bd93c36b4d54fd2c6098 /gcc | |
| parent | c8694a801c2d31e2c22c64329f7090ea1ba99085 (diff) | |
| download | gcc-5a0626d162e8c3a29b48872336ebc1b51cf26c43.zip gcc-5a0626d162e8c3a29b48872336ebc1b51cf26c43.tar.gz gcc-5a0626d162e8c3a29b48872336ebc1b51cf26c43.tar.bz2 | |
pt.c (tsubst_copy_and_build): Fix qualified_name_lookup_error call in case COMPONENT_REF.
2011-11-07 Paolo Carlini <paolo.carlini@oracle.com>
* pt.c (tsubst_copy_and_build): Fix qualified_name_lookup_error
call in case COMPONENT_REF.
From-SVN: r181124
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 72aa051..f75fcc2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2011-11-07 Paolo Carlini <paolo.carlini@oracle.com> + + * pt.c (tsubst_copy_and_build): Fix qualified_name_lookup_error + call in case COMPONENT_REF. + 2011-11-07 Jason Merrill <jason@redhat.com> Dodji Seketeli <dodji@redhat.com> diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c8c8d91..c4f4a94 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13894,14 +13894,12 @@ tsubst_copy_and_build (tree t, else if (TREE_CODE (member) == SCOPE_REF && TREE_CODE (TREE_OPERAND (member, 1)) == TEMPLATE_ID_EXPR) { - tree tmpl; - tree args; - /* Lookup the template functions now that we know what the scope is. */ - tmpl = TREE_OPERAND (TREE_OPERAND (member, 1), 0); - args = TREE_OPERAND (TREE_OPERAND (member, 1), 1); - member = lookup_qualified_name (TREE_OPERAND (member, 0), tmpl, + tree scope = TREE_OPERAND (member, 0); + tree tmpl = TREE_OPERAND (TREE_OPERAND (member, 1), 0); + tree args = TREE_OPERAND (TREE_OPERAND (member, 1), 1); + member = lookup_qualified_name (scope, tmpl, /*is_type_p=*/false, /*complain=*/false); if (BASELINK_P (member)) @@ -13915,7 +13913,7 @@ tsubst_copy_and_build (tree t, } else { - qualified_name_lookup_error (object_type, tmpl, member, + qualified_name_lookup_error (scope, tmpl, member, input_location); return error_mark_node; } |