* skip_whitespace: Rearrange to avoid stage1 ICE.

From-SVN: r65809

diff --git a/gcc/cpplex.c b/gcc/cpplex.c
index 930e887948d230df652d4e11ab5b0a8b5b4f98b3..ce9a8d4c78b0eb07d4790703a79fc94cfd7212c7 100644 (file)
--- a/gcc/cpplex.c
+++ b/gcc/cpplex.c
@@ -334,7 +334,7 @@ skip_whitespace (pfile, c)
      cppchar_t c;
 {
   cpp_buffer *buffer = pfile->buffer;
-  unsigned int warned = 0;
+  bool saw_NUL = false;
 
   do
     {
@@ -343,13 +343,7 @@ skip_whitespace (pfile, c)
        ;
       /* Just \f \v or \0 left.  */
       else if (c == '\0')
-       {
-         if (!warned)
-           {
-             cpp_error (pfile, DL_WARNING, "null character(s) ignored");
-             warned = 1;
-           }
-       }
+       saw_NUL = true;
       else if (pfile->state.in_directive && CPP_PEDANTIC (pfile))
        cpp_error_with_line (pfile, DL_PEDWARN, pfile->line,
                             CPP_BUF_COL (buffer),
@@ -361,6 +355,9 @@ skip_whitespace (pfile, c)
   /* We only want non-vertical space, i.e. ' ' \t \f \v \0.  */
   while (is_nvspace (c));
 
+  if (saw_NUL)
+    cpp_error (pfile, DL_WARNING, "null character(s) ignored");
+
   buffer->cur--;
 }