diff options
| author | Mark Mitchell <mmitchell@usa.net> | 1998-04-01 16:27:24 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 1998-04-01 16:27:24 +0000 |
| commit | 59581da6977aeae5819b43ebdd1eed1ee7f0d514 (patch) | |
| tree | 1827084179aea726791cfee72adc008fb5569df5 /gcc | |
| parent | 63959c221b111a8fd35f08b1f66831edf740c248 (diff) | |
| download | gcc-59581da6977aeae5819b43ebdd1eed1ee7f0d514.zip gcc-59581da6977aeae5819b43ebdd1eed1ee7f0d514.tar.gz gcc-59581da6977aeae5819b43ebdd1eed1ee7f0d514.tar.bz2 | |
call.c (build_over_call): Do name resolution for default arguments of function templates in the scope of...
* call.c (build_over_call): Do name resolution for default
arguments of function templates in the scope of the templates.
From-SVN: r18932
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 23 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.pt/defarg4.C | 32 |
3 files changed, 57 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 06f1bb0..7d96732 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +Wed Apr 1 14:58:35 1998 Mark Mitchell <mmitchell@usa.net> + + * call.c (build_over_call): Do name resolution for default + arguments of function templates in the scope of the templates. + Tue Mar 31 13:43:57 1998 Jeffrey A Law (law@cygnus.com) * call.c: Include system.h. Remove includes, declarations and diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 2959fc2..ab3e05e 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3220,9 +3220,26 @@ build_over_call (fn, convs, args, flags) tree arg = TREE_PURPOSE (parm); if (DECL_TEMPLATE_INFO (fn)) - /* This came from a template. Instantiate the default arg here, - not in tsubst. */ - arg = tsubst_expr (arg, DECL_TI_ARGS (fn), NULL_TREE); + { + /* This came from a template. Instantiate the default arg here, + not in tsubst. In the case of something like: + + template <class T> + struct S { + static T t(); + void f(T = t()); + }; + + we must be careful to do name lookup in the scope of + S<T>, rather than in the current class. */ + if (DECL_REAL_CONTEXT (fn)) + pushclass (DECL_REAL_CONTEXT (fn), 2); + + arg = tsubst_expr (arg, DECL_TI_ARGS (fn), NULL_TREE); + + if (DECL_REAL_CONTEXT (fn)) + popclass (0); + } converted_args = expr_tree_cons (NULL_TREE, convert_default_arg (TREE_VALUE (parm), arg), converted_args); diff --git a/gcc/testsuite/g++.old-deja/g++.pt/defarg4.C b/gcc/testsuite/g++.old-deja/g++.pt/defarg4.C new file mode 100644 index 0000000..9d5df8c --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.pt/defarg4.C @@ -0,0 +1,32 @@ +// Build don't link: + +template <class T> +struct S1 +{ + void foo(T = t()); + + static T t(); +}; + + +template <class T> +struct S2 +{ + void bar(); +}; + + +template <class T> +void S2<T>::bar () +{ + S1<T> st; + st.foo(); +} + + +int main() +{ + S2<int> s2i; + s2i.bar(); +} + |