diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-20 09:33:01 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-20 09:33:01 +0000 |
| commit | 005ffb8d0548bc33c64b9ea0ff31f0001d7b9b93 (patch) | |
| tree | 23604c4b885ed0c3491942bb3ca2a1900184878c | |
| parent | 13d534046885e06335cbfec13655427f8fa013f5 (diff) | |
| download | gcc-005ffb8d0548bc33c64b9ea0ff31f0001d7b9b93.tar.gz | |
* cppmacro.c (funlike_invocation_p): Don't move back up to the
context of the top of the stack.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39152 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cppmacro.c | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 46627c84cf5..918c56295bb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-01-20 Neil Booth <neil@daikokuya.demon.co.uk> + + * cppmacro.c (funlike_invocation_p): Don't move back up to the + context of the top of the stack. + 2001-01-20 Jakub Jelinek <jakub@redhat.com> * function.c (fixup_var_refs): Move CALL_PLACEHOLDER handling... diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c index 1539552076b..a7d71a09644 100644 --- a/gcc/cppmacro.c +++ b/gcc/cppmacro.c @@ -596,7 +596,7 @@ funlike_invocation_p (pfile, node, list) const cpp_hashnode *node; struct toklist *list; { - cpp_context *orig, *final; + cpp_context *orig; cpp_token maybe_paren; macro_arg *args = 0; cpp_lexer_pos macro_pos; @@ -618,7 +618,6 @@ funlike_invocation_p (pfile, node, list) node->name); /* Restore original context. */ - final = pfile->context; pfile->context = orig; pfile->state.prevent_expansion--; pfile->state.parsing_args = 0; @@ -639,13 +638,6 @@ funlike_invocation_p (pfile, node, list) free (args); } - /* Re-disable macros *after* pre-expansion. */ - while (final != orig) - { - final = final->next; - final->macro->disabled = 1; - } - return args != 0; } |