diff options
| -rw-r--r-- | lib/Frontend/PrintPreprocessedOutput.cpp | 3 | ||||
| -rw-r--r-- | test/Lexer/pragma-operators.cpp | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lib/Frontend/PrintPreprocessedOutput.cpp b/lib/Frontend/PrintPreprocessedOutput.cpp index 2159d3e80d..d0aef2918c 100644 --- a/lib/Frontend/PrintPreprocessedOutput.cpp +++ b/lib/Frontend/PrintPreprocessedOutput.cpp @@ -455,8 +455,7 @@ struct UnknownPragmaHandler : public PragmaHandler { Token &PragmaTok) { // Figure out what line we went to and insert the appropriate number of // newline characters. - if (Introducer == PIK__Pragma || Introducer == PIK___pragma) - Callbacks->StartNewLineIfNeeded(); + Callbacks->StartNewLineIfNeeded(); Callbacks->MoveToLine(PragmaTok.getLocation()); Callbacks->OS.write(Prefix, strlen(Prefix)); Callbacks->SetEmittedTokensOnThisLine(); diff --git a/test/Lexer/pragma-operators.cpp b/test/Lexer/pragma-operators.cpp index af346e8c96..d1645adbc2 100644 --- a/test/Lexer/pragma-operators.cpp +++ b/test/Lexer/pragma-operators.cpp @@ -3,13 +3,18 @@ // Test that we properly expand the C99 _Pragma and Microsoft __pragma // into #pragma directives, with newlines where needed. <rdar://problem/8412013> -// CHECK: extern // CHECK: #line // CHECK: #pragma warning(push) +// CHECK: extern "C" { // CHECK: #line -// CHECK: ; void f0(); +// CHECK: #pragma warning(push) +// CHECK: int foo() { return 0; } } // CHECK: #line // CHECK: #pragma warning(pop) -// CHECK: #line -// CHECK: ; } -extern "C" { _Pragma("warning(push)"); void f0(); __pragma(warning(pop)); } +#define A(X) extern "C" { __pragma(warning(push)) \ + int X() { return 0; } \ +} +#define B(X) A(X) +#pragma warning(push) +B(foo) +#pragma warning(pop) |