mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-09 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

decl.c (push_local_binding): Also wrap used decls in a TREE_LIST.

Browse Source 
* decl.c (push_local_binding): Also wrap used decls in a TREE_LIST.
	(poplevel): Handle that.  Fix logic for removing TREE_LISTs.
	(cat_namespace_levels): Don't loop forever.
Fixes 733Y14.
	* typeck.c (build_reinterpret_cast): Fix typo in duplicated test.

From-SVN: r24867
This commit is contained in:
Jason Merrill 1999-01-25 19:50:29 -05:00
parent 9602dbfbf4
commit a06d48ef02
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/cp/ChangeLog
View File

@ -1,3 +1,13 @@
1999-01-26 Jason Merrill <jason@yorick.cygnus.com>
* decl.c (push_local_binding): Also wrap used decls in a TREE_LIST.
(poplevel): Handle that. Fix logic for removing TREE_LISTs.
(cat_namespace_levels): Don't loop forever.
1999-01-25 Richard Henderson <rth@cygnus.com>
* typeck.c (build_reinterpret_cast): Fix typo in duplicated test.
1999-01-25 Jason Merrill <jason@yorick.cygnus.com>
* class.c (resolve_address_of_overloaded_function): Mark the

37
gcc/cp/decl.c
View File

@ -1126,18 +1126,20 @@ push_local_binding (id, decl)
{
tree d = decl;
if (TREE_CODE (decl) == OVERLOAD)
/* We must put the OVERLOAD into a TREE_LIST since the
TREE_CHAIN of an OVERLOAD is already used. */
decl = build_tree_list (NULL_TREE, decl);
if (lookup_name_current_level (id))
/* Supplement the existing binding. */
add_binding (id, decl);
add_binding (id, d);
else
/* Create a new binding. */
push_binding (id, d, current_binding_level);
if (TREE_CODE (decl) == OVERLOAD
|| (DECL_P (decl) && DECL_NAMESPACE_SCOPE_P (decl)))
/* We must put the OVERLOAD into a TREE_LIST since the
TREE_CHAIN of an OVERLOAD is already used. Similarly for
decls that got here through a using-declaration. */
decl = build_tree_list (NULL_TREE, decl);
/* And put DECL on the list of things declared by the current
binding level. */
TREE_CHAIN (decl) = current_binding_level->names;
@ -1423,11 +1425,12 @@ poplevel (keep, reverse, functionbody)
else
{
/* Remove the binding. */
if (TREE_CODE (link) == TREE_LIST)
link = TREE_VALUE (link);
if (TREE_CODE_CLASS (TREE_CODE (link)) == 'd')
pop_binding (DECL_NAME (link), link);
else if (TREE_CODE (link) == TREE_LIST)
pop_binding (DECL_NAME (OVL_FUNCTION (TREE_VALUE (link))),
TREE_VALUE (link));
else if (TREE_CODE (link) == OVERLOAD)
pop_binding (DECL_NAME (OVL_FUNCTION (link)), link);
else
my_friendly_abort (0);
}
@ -1454,11 +1457,13 @@ poplevel (keep, reverse, functionbody)
{
tree* d;
for (d = &BLOCK_VARS (block);
*d;
d = *d ? &TREE_CHAIN (*d) : d)
if (TREE_CODE (*d) == TREE_LIST)
*d = TREE_CHAIN (*d);
for (d = &BLOCK_VARS (block); *d; )
{
if (TREE_CODE (*d) == TREE_LIST)
*d = TREE_CHAIN (*d);
else
d = &TREE_CHAIN (*d);
}
}
/* If the level being exited is the top level of a function,
@ -2078,6 +2083,10 @@ cat_namespace_levels()
/* The nested namespaces appear in the names list of their ancestors. */
for (current = last; current; current = TREE_CHAIN (current))
{
/* Catch simple infinite loops. */
if (TREE_CHAIN (current) == current)
my_friendly_abort (990126);
if (TREE_CODE (current) != NAMESPACE_DECL
|| DECL_NAMESPACE_ALIAS (current))
continue;

2
gcc/cp/typeck.c
View File

@ -5485,7 +5485,7 @@ build_reinterpret_cast (type, expr)
return fold (build1 (NOP_EXPR, type, expr));
}
else if ((TYPE_PTRFN_P (type) && TYPE_PTROBV_P (intype))
|| (TYPE_PTRFN_P (type) && TYPE_PTROBV_P (intype)))
|| (TYPE_PTRFN_P (intype) && TYPE_PTROBV_P (type)))
{
pedwarn ("ANSI C++ forbids casting between pointers to functions and objects");
if (TREE_READONLY_DECL_P (expr))