diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-19 17:14:38 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-19 17:14:38 +0000 |
| commit | 0047596cb0d3db50e8e8f0c9bbf7189a536ae722 (patch) | |
| tree | d4116225e99f864a5e34b33886c99b66a3723bb7 /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 2c197e09397ee071c678ba77c2451166264b55f7 (diff) | |
| download | bcm5719-llvm-0047596cb0d3db50e8e8f0c9bbf7189a536ae722.tar.gz bcm5719-llvm-0047596cb0d3db50e8e8f0c9bbf7189a536ae722.zip | |
Correctly format macro with unfinished template declaration.
We can now format:
#define A template <typename T>
Before this created a segfault :-/.
llvm-svn: 175533
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index bb2e04b66e8..d9368c36499 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -293,7 +293,8 @@ private: next(); if (!parseAngle()) return false; - CurrentToken->Parent->ClosesTemplateDeclaration = true; + if (CurrentToken != NULL) + CurrentToken->Parent->ClosesTemplateDeclaration = true; return true; } return false; |
