commit c52435b4a254af96128c19e473071ec30cfb51f2
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 6004c6cb005bae3a6c52fe6fce0e74c9d7a3f6f1
parent d7678c6af510b224795d36acca83afc7396f8f7c

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

llvm-svn: 171944

clang/lib/Frontend/PrintPreprocessedOutput.cpp

diff --git a/clang/lib/Frontend/PrintPreprocessedOutput.cpp b/clang/lib/Frontend/PrintPreprocessedOutput.cpp
index afad0a9..02da71b 100644
--- a/clang/lib/Frontend/PrintPreprocessedOutput.cpp
+++ b/clang/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);

clang/test/Preprocessor/print_line_include.c

diff --git a/clang/test/Preprocessor/print_line_include.c b/clang/test/Preprocessor/print_line_include.c
new file mode 100644
index 0000000..d65873c
--- /dev/null
+++ b/clang/test/Preprocessor/print_line_include.c
@@ -0,0 +1,6 @@
+// RUN: %clang_cc1 -E -P %s | FileCheck %s
+// CHECK: int x;
+// CHECK-NEXT: int x;
+
+#include "print_line_include.h"
+#include "print_line_include.h"

clang/test/Preprocessor/print_line_include.h

diff --git a/clang/test/Preprocessor/print_line_include.h b/clang/test/Preprocessor/print_line_include.h
new file mode 100644
index 0000000..6d1a0d4
--- /dev/null
+++ b/clang/test/Preprocessor/print_line_include.h
@@ -0,0 +1 @@
+int x;