commit 086cc83a84bfab60685b69e3afa3e4500daebb4d
author Eli Friedman <eli.friedman@gmail.com> Wed Jan 09 03:16:42 2013 +0000
committer Eli Friedman <eli.friedman@gmail.com> Wed Jan 09 03:16:42 2013 +0000
tree a9c0fd6d7f557b4db273db367a2ce4f912f8fddb
parent a0f2d02d166880e5d826074b6c2ecbf64f8ca70d

Make sure clang puts tokens from different files on separate lines in "-E -P" mode.  <rdar://problem/12774044>
 


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171944 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Frontend/PrintPreprocessedOutput.cpp

diff --git a/lib/Frontend/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp
index afad0a9..02da71b 100644
--- a/lib/Frontend/PrintPreprocessedOutput.cpp
+++ b/lib/Frontend/PrintPreprocessedOutput.cpp
@@ -268,7 +268,10 @@
   Lexer::Stringify(CurFilename);
   FileType = NewFileType;
 
-  if (DisableLineMarkers) return;
+  if (DisableLineMarkers) {
+    startNewLineIfNeeded(/*ShouldUpdateCurrentLine=*/false);
+    return;
+  }
   
   if (!Initialized) {
     WriteLineInfo(CurLine);