cppmacro.c (funlike_invocation_p): Don't move back up to the context of the top of...

        * cppmacro.c (funlike_invocation_p): Don't move back up to the
        context of the top of the stack.

From-SVN: r39152

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 46627c84cf598c635ef8047125db2d82b1172a28..918c56295bbfaeab91894dddf61b601ecea7fff5 100644 (file)
--- 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 1539552076bea82e041656980864e4546259cbf0..a7d71a096440ebbd395c1c67963f30a87c00c96a 100644 (file)
--- 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;
 }