PR target/39558

[pf3gnuchains/gcc-fork.git] / libcpp / macro.c

diff --git a/libcpp/macro.c b/libcpp/macro.c
index 3a20c36..fc70be6 100644 (file)
--- a/libcpp/macro.c
+++ b/libcpp/macro.c
@@ -1260,10 +1260,36 @@ cpp_get_token (cpp_reader *pfile)
 
          /* Conditional macros require that a predicate be evaluated
             first.  */
-         if (((!(node->flags & NODE_CONDITIONAL))
-              || (pfile->cb.macro_to_expand
-                  && (node = pfile->cb.macro_to_expand (pfile, result))))
-             && (ret = enter_macro_context (pfile, node, result)))
+         if ((node->flags & NODE_CONDITIONAL) != 0)
+           {
+             if (pfile->cb.macro_to_expand)
+               {
+                 bool whitespace_after;
+                 const cpp_token *peek_tok = cpp_peek_token (pfile, 0);
+
+                 whitespace_after = (peek_tok->type == CPP_PADDING
+                                     || (peek_tok->flags & PREV_WHITE));
+                 node = pfile->cb.macro_to_expand (pfile, result);
+                 if (node)
+                   ret = enter_macro_context (pfile, node, result);
+                 else if (whitespace_after)
+                   {
+                     /* If macro_to_expand hook returned NULL and it
+                        ate some tokens, see if we don't need to add
+                        a padding token in between this and the
+                        next token.  */
+                     peek_tok = cpp_peek_token (pfile, 0);
+                     if (peek_tok->type != CPP_PADDING
+                         && (peek_tok->flags & PREV_WHITE) == 0)
+                       _cpp_push_token_context (pfile, NULL,
+                                                padding_token (pfile,
+                                                               peek_tok), 1);
+                   }
+               }
+           }
+         else
+           ret = enter_macro_context (pfile, node, result);
+         if (ret)
            {
              if (pfile->state.in_directive || ret == 2)
                continue;