diff options
| -rw-r--r-- | clang/lib/Format/QualifierAlignmentFixer.cpp | 2 | ||||
| -rwxr-xr-x | clang/unittests/Format/QualifierFixerTest.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp index 7480202..fc37f18 100644 --- a/clang/lib/Format/QualifierAlignmentFixer.cpp +++ b/clang/lib/Format/QualifierAlignmentFixer.cpp @@ -407,6 +407,8 @@ LeftRightQualifierAlignmentFixer::analyze( assert(QualifierToken != tok::identifier && "Unrecognised Qualifier"); for (AnnotatedLine *Line : AnnotatedLines) { + if (Line->InPPDirective) + continue; FormatToken *First = Line->First; assert(First); if (First->Finalized) diff --git a/clang/unittests/Format/QualifierFixerTest.cpp b/clang/unittests/Format/QualifierFixerTest.cpp index 167a30e..cd796f4 100755 --- a/clang/unittests/Format/QualifierFixerTest.cpp +++ b/clang/unittests/Format/QualifierFixerTest.cpp @@ -815,6 +815,7 @@ TEST_F(QualifierFixerTest, NoOpQualifierReplacements) { ReplacementCount = 0; EXPECT_EQ(ReplacementCount, 0); verifyFormat("static const uint32 foo[] = {0, 31};", Style); + verifyFormat("#define MACRO static const", Style); EXPECT_EQ(ReplacementCount, 0); } |