clang-format: Fix crasher caused by incorrect resetting of token info.

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

diff --git a/lib/Format/TokenAnnotator.h b/lib/Format/TokenAnnotator.h
index 8aa163aff61562be90b582362c661b991f725b45..f9e1efa31b241ba3a8cd470a656c240f5c630cee 100644 (file)
--- a/lib/Format/TokenAnnotator.h
+++ b/lib/Format/TokenAnnotator.h
@@ -75,6 +75,7 @@ public:
     FormatToken *Current = First;
     while (Current) {
       Current->Children.clear();
+      Current->Role.reset();
       Current = Current->Next;
     }
   }

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index bb8f5bc0b829c3514acbcfdbe8abdc934398da2f..553368d563302db66f76d27abe070b09cea9bd14 100644 (file)
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -2613,6 +2613,7 @@ TEST_F(FormatTest, MacroDefinitionsWithIncompleteCode) {
 
   verifyNoCrash("#if a\na(\n#else\n#endif\n{a");
   verifyNoCrash("a={0,1\n#if a\n#else\n;\n#endif\n}");
+  verifyNoCrash("#if a\na(\n#else\n#endif\n) a {a,b,c,d,f,g};");
 }
 
 TEST_F(FormatTest, MacrosWithoutTrailingSemicolon) {