OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpphash.c (collect_expansion): Also catch ## at start of macro. 

* cpphash.c (collect_expansion): Also catch ## at start of macro.

        * varasm.c (make_decl_rtl): Don't add a number to members of
        local classes.
        (make_function_rtl): Likewise.

From-SVN: r32378
This commit is contained in:
Jason Merrill 2000-03-07 08:34:34 +00:00 committed by Jason Merrill
parent 5816f88b4b
commit 7d26bd1698
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2000-03-06 Jason Merrill <jason@casey.cygnus.com>
* cpphash.c (collect_expansion): Also catch ## at start of macro.
* varasm.c (make_decl_rtl): Don't add a number to members of
local classes.
(make_function_rtl): Likewise.
2000-03-06 Alexandre Oliva <oliva@lsd.ic.unicamp.br>
* gcse.c (compute_can_copy): Adjust if/else blocks from rth's

2
gcc/cpphash.c
View File

@ -346,6 +346,8 @@ collect_expansion (pfile, arglist)
else if (last_token == PASTE)
/* ## ## - the second ## is ordinary. */
goto norm;
else if (last_token == START)
cpp_error (pfile, "`##' at start of macro definition");
/* Discard the token and any hspace before it. */
while (is_hspace (pfile->token_buffer[here-1]))

11
gcc/varasm.c
View File

@ -522,8 +522,10 @@ make_function_rtl (decl)
char *name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl));
char *new_name = name;
/* Rename a nested function to avoid conflicts. */
/* Rename a nested function to avoid conflicts, unless it's a member of
a local class, in which case the class name is already unique. */
if (decl_function_context (decl) != 0
&& ! TYPE_P (DECL_CONTEXT (decl))
&& DECL_INITIAL (decl) != 0
&& DECL_RTL (decl) == 0)
{
@ -765,9 +767,12 @@ make_decl_rtl (decl, asmspec, top_level)
if (DECL_RTL (decl) == 0)
{
/* Can't use just the variable's own name for a variable
whose scope is less than the whole file.
whose scope is less than the whole file, unless it's a member
of a local class (which will already be unambiguous).
Concatenate a distinguishing number. */
if (!top_level && !TREE_PUBLIC (decl) && asmspec == 0)
if (!top_level && !TREE_PUBLIC (decl)
&& ! TYPE_P (DECL_CONTEXT (decl))
&& asmspec == 0)
{
char *label;