* cppmacro.c (funlike_invocation_p): No need to restore context.

From-SVN: r45395

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 611fb9434de5a509d0260b0c8f2bc52c5250b86c..6059426da0821d2d1e39ed404f730a797b6b6442 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-05  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * cppmacro.c (funlike_invocation_p): No need to restore context.
+
 2001-09-04  Richard Henderson  <rth@redhat.com>
 
        * reload.c (push_reload): Export.

diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 1ee91b7b305c5aaf290617d33c92397c41cd5546..81828f156f0c8a1b030727f723d378694e6efbb2 100644 (file)
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -591,7 +591,6 @@ funlike_invocation_p (pfile, node, list)
      const cpp_hashnode *node;
      struct toklist *list;
 {
-  cpp_context *orig;
   cpp_token maybe_paren;
   macro_arg *args = 0;
   cpp_lexer_pos macro_pos;
@@ -599,7 +598,6 @@ funlike_invocation_p (pfile, node, list)
   macro_pos = pfile->lexer_pos;
   pfile->state.parsing_args = 1;
   pfile->state.prevent_expansion++;
-  orig = pfile->context;
 
   cpp_start_lookahead (pfile);
   cpp_get_token (pfile, &maybe_paren);
@@ -613,8 +611,6 @@ funlike_invocation_p (pfile, node, list)
         "function-like macro \"%s\" must be used with arguments in traditional C",
                 NODE_NAME (node));
 
-  /* Restore original context.  */
-  pfile->context = orig;
   pfile->state.prevent_expansion--;
   pfile->state.parsing_args = 0;
 
@@ -886,8 +882,7 @@ _cpp_pop_context (pfile)
   if (!pfile->context->prev && !pfile->state.parsing_args)
     unlock_pools (pfile);
 
-  /* Re-enable a macro, temporarily if parsing_args, when leaving its
-     expansion.  */
+  /* Re-enable a macro when leaving its expansion.  */
   context->macro->disabled = 0;
 }