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

cpplex.c (push_macro_context): Set an argument's level after calling parse_args.

Browse source 
* cpplex.c (push_macro_context): Set an argument's level after
	calling parse_args.  We could loop infinitely otherwise.
	* gcc.dg/cpp/macro2.c: New testcase.

From-SVN: r36452
This commit is contained in:
Neil Booth 2000-09-16 07:18:06 +00:00 • committed by Neil Booth
parent d9fbca261e
commit 08ebc1c594
4 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/ChangeLog
View file

@ -1,3 +1,8 @@
Sat 16-Sep-2000 08:13:45 BST Neil Booth <NeilB@earthling.net>
* cpplex.c (push_macro_context): Set an argument's level after
calling parse_args. We could loop infinitely otherwise.
2000-09-15 Tom Tromey <tromey@cygnus.com>
* configure, config.in: Rebuilt.

3
gcc/cpplex.c
View file

@ -2972,7 +2972,6 @@ push_macro_context (pfile, token)
args->tokens = 0;
args->capacity = 0;
args->used = 0;
args->level = pfile->cur_context;
prev_nme = prevent_macro_expansion (pfile);
pfile->args = args;
@ -2984,6 +2983,8 @@ push_macro_context (pfile, token)
free_macro_args (args);
return 1;
}
/* Set the level after the call to parse_args. */
args->level = pfile->cur_context;
}
/* Now push its context. */

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
Sat 16-Sep-2000 08:14:58 BST Neil Booth <NeilB@earthling.net>
* gcc.dg/cpp/macro2.c: Testcase for multi-context arguments
in nested macro bug.
Fri 15-Sep-2000 06:50:11 BST Neil Booth <NeilB@earthling.net>
* gcc.dg/cpp/paste10.c: Testcase for PASTE_LEFT buglet.

14
gcc/testsuite/gcc.dg/cpp/macro2.c Normal file
View file

@ -0,0 +1,14 @@
/* Copyright (C) 2000 Free Software Foundation, Inc. */
/* { dg-do preprocess } */
/* Tests the argument context get set at the lower level if we drop
contexts whilst parsing arguments. This would enter an infinite
loop in is_macro_disabled previously. */
#define A Something
#define B C
#define C K(
#define K(S) S
#define T B A )
T /* Expands to <Something>. */