diff options
| -rw-r--r-- | lib/Frontend/PrintPreprocessedOutput.cpp | 9 | ||||
| -rw-r--r-- | test/Preprocessor/dump-macros-spacing.c | 13 |
2 files changed, 20 insertions, 2 deletions
diff --git a/lib/Frontend/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp index e79453c28c..89d099caf8 100644 --- a/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/lib/Frontend/PrintPreprocessedOutput.cpp @@ -87,6 +87,7 @@ public: private: unsigned CurLine; bool EmittedTokensOnThisLine; + bool EmittedMacroOnThisLine; SrcMgr::CharacteristicKind FileType; llvm::SmallString<512> CurFilename; bool Initialized; @@ -100,6 +101,7 @@ public: CurLine = 0; CurFilename += "<uninit>"; EmittedTokensOnThisLine = false; + EmittedMacroOnThisLine = false; FileType = SrcMgr::C_User; Initialized = false; } @@ -130,9 +132,10 @@ public: void PrintPPOutputPPCallbacks::WriteLineInfo(unsigned LineNo, const char *Extra, unsigned ExtraLen) { - if (EmittedTokensOnThisLine) { + if (EmittedTokensOnThisLine || EmittedMacroOnThisLine) { OS << '\n'; EmittedTokensOnThisLine = false; + EmittedMacroOnThisLine = false; } OS << '#' << ' ' << LineNo << ' ' << '"'; @@ -161,11 +164,12 @@ bool PrintPPOutputPPCallbacks::MoveToLine(SourceLocation Loc) { CurLine = LineNo; - if (!EmittedTokensOnThisLine) + if (!EmittedTokensOnThisLine && !EmittedMacroOnThisLine) return true; OS << '\n'; EmittedTokensOnThisLine = false; + EmittedMacroOnThisLine = false; return true; } @@ -260,6 +264,7 @@ void PrintPPOutputPPCallbacks::MacroDefined(const IdentifierInfo *II, MoveToLine(MI->getDefinitionLoc()); PrintMacroDefinition(*II, *MI, PP, OS); + EmittedMacroOnThisLine = true; } diff --git a/test/Preprocessor/dump-macros-spacing.c b/test/Preprocessor/dump-macros-spacing.c new file mode 100644 index 0000000000..335e37c97e --- /dev/null +++ b/test/Preprocessor/dump-macros-spacing.c @@ -0,0 +1,13 @@ +// RUN: clang-cc -E -dD < %s | grep stdin | grep -v define +#define A A +/* 1 + * 2 + * 3 + * 4 + * 5 + * 6 + * 7 + * 8 + */ +#define B B + |