procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

decl.c (expand_static_init): Build cleanups before entering the anonymous function used to do them to avoid...

Browse source 
* decl.c (expand_static_init): Build cleanups before entering the
	anonymous function used to do them to avoid access-checking
	confusion.
	* decl.c (grokfndecl): Add back call to cplus_decl_attributes
	accidentally removed by previous change, and make DECL_RTL here.
	* class.c (add_method): Don't make DECL_RTL here.

From-SVN: r23138
This commit is contained in:
Mark Mitchell 1998-10-16 14:06:24 +00:00 • committed by Mark Mitchell
parent 588c2d1c2f
commit 7cfac5953a
4 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/cp/ChangeLog
View file

@ -1,5 +1,13 @@
1998-10-16 Mark Mitchell <mark@markmitchell.com>
* decl.c (expand_static_init): Build cleanups before entering the
anonymous function used to do them to avoid access-checking
confusion.
* decl.c (grokfndecl): Add back call to cplus_decl_attributes
accidentally removed by previous change, and make DECL_RTL here.
* class.c (add_method): Don't make DECL_RTL here.
* pt.c (for_each_template_parm): Don't examine uninstantiated
default arguments.

3
gcc/cp/class.c
View file

@ -1270,9 +1270,6 @@ add_method (type, fields, method)
}
}
/* Create RTL for the METHOD. */
make_decl_rtl (method, NULL_PTR, 1);
/* Actually insert the new method. */
TREE_VEC_ELT (method_vec, i)
= build_overload (method, TREE_VEC_ELT (method_vec, i));

12
gcc/cp/decl.c
View file

@ -7814,8 +7814,13 @@ expand_static_init (decl, init)
pop_obstacks ();
}
/* Call build_cleanup before we enter the anonymous function
so that any access checks will be done relative to the
current scope, rather than the scope of the anonymous
function. */
fcall = build_cleanup (decl);
cleanup = start_anon_func ();
expand_expr_stmt (build_cleanup (decl));
expand_expr_stmt (fcall);
end_anon_func ();
mark_addressable (cleanup);
cleanup = build_unary_op (ADDR_EXPR, cleanup, 0);
@ -8235,6 +8240,11 @@ grokfndecl (ctype, type, declarator, orig_declarator, virtualp, flags, quals,
if (ctype == NULL_TREE || check)
return decl;
if (attrlist)
cplus_decl_attributes (decl, TREE_PURPOSE (attrlist),
TREE_VALUE (attrlist));
make_decl_rtl (decl, NULL_PTR, 1);
if (virtualp)
{
DECL_VIRTUAL_P (decl) = 1;

14
gcc/testsuite/g++.old-deja/g++.other/static3.C Normal file
View file

@ -0,0 +1,14 @@
// Build don't link:
class S
{
~S();
public:
friend void f();
};
S::~S()
{
static S s;
}