mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 08:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

pt.c (push_access_scope_real): Call push_to_top_level for function in namespace scope.

Browse Source 
* pt.c (push_access_scope_real): Call push_to_top_level for
	function in namespace scope.
	(pop_access_scope): Call pop_from_top_level for function in
	namespace scope.

	* g++.dg/template/friend14.C: New test.

From-SVN: r61114
This commit is contained in:
Kriang Lerdsuwanakij 2003-01-09 13:55:46 +00:00 committed by Kriang Lerdsuwanakij
parent c456a45a19
commit 0f399e5f9b
4 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2003-01-09 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
* pt.c (push_access_scope_real): Call push_to_top_level for
function in namespace scope.
(pop_access_scope): Call pop_from_top_level for function in
namespace scope.
2003-01-09 Jakub Jelinek <jakub@redhat.com>
* decl.c (start_decl): Don't set DECL_COMMON for __thread variables.

21
gcc/cp/pt.c
View File

@ -209,16 +209,21 @@ push_access_scope_real (t, args, context)
if (spec)
t = spec;
}
saved_access_scope = tree_cons
(NULL_TREE, current_function_decl, saved_access_scope);
current_function_decl = t;
}
if (!context)
context = DECL_CONTEXT (t);
if (context && TYPE_P (context))
push_nested_class (context, 2);
else
push_to_top_level ();
if (TREE_CODE (t) == FUNCTION_DECL || DECL_FUNCTION_TEMPLATE_P (t))
{
saved_access_scope = tree_cons
(NULL_TREE, current_function_decl, saved_access_scope);
current_function_decl = t;
}
}
/* Like push_access_scope_real, but always uses DECL_CONTEXT. */
@ -237,14 +242,16 @@ void
pop_access_scope (t)
tree t;
{
if (DECL_CLASS_SCOPE_P (t))
pop_nested_class ();
if (TREE_CODE (t) == FUNCTION_DECL || DECL_FUNCTION_TEMPLATE_P (t))
{
current_function_decl = TREE_VALUE (saved_access_scope);
saved_access_scope = TREE_CHAIN (saved_access_scope);
}
if (DECL_CLASS_SCOPE_P (t))
pop_nested_class ();
else
pop_from_top_level ();
}
/* Do any processing required when DECL (a member template

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2003-01-09 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
* g++.dg/template/friend14.C: New test.
2003-01-09 Eric Botcazou <ebotcazou@libertysurf.fr>
* gcc.dg/old-style-asm-1.c: New test.

20
gcc/testsuite/g++.dg/template/friend14.C Normal file
View File

@ -0,0 +1,20 @@
// { dg-do compile }
// Origin: Wolfgang Bangerth <bangerth@ticam.utexas.edu>
// Perform access checking to parameter and return type of
// function template correctly when the template is friend.
template <class T> class O {
struct I { I (int); };
template <class T_>
friend typename O<T_>::I f ();
};
template <class T_>
typename O<T_>::I f () { return 1; }
struct X {
void g() { f<int>(); }
};