From dec3d2a0afb226fe3b74164b4db4ef1adf0459bb Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 29 Oct 2011 00:06:34 +0000 Subject: [PATCH] 2011-10-28 Paolo Carlini Revert Fix for c++/50864. From-SVN: r180640 --- gcc/cp/pt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index bd95096d613..d0577762cbd 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -13741,12 +13741,14 @@ 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. */ - 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, + 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, /*is_type_p=*/false, /*complain=*/false); if (BASELINK_P (member)) @@ -13760,7 +13762,7 @@ tsubst_copy_and_build (tree t, } else { - qualified_name_lookup_error (scope, tmpl, member, + qualified_name_lookup_error (object_type, tmpl, member, input_location); return error_mark_node; }