commit 30029c6b5854ce50bdcf7446d64bbbf817a69bee
author Daniel Jasper <djasper@google.com> Thu Feb 05 11:05:31 2015 +0000
committer Daniel Jasper <djasper@google.com> Thu Feb 05 11:05:31 2015 +0000
tree b127ac2c0f068f244667c5883e5258cdc889cca8
parent cb8c3d789e3f2bdc07e339b1aff5779d06cc29e9

clang-format: Fix assert triggering on carriage returns.

llvm-svn: 228288

clang/lib/Format/Format.cpp

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 309b322..2c71bb2 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -884,6 +884,9 @@
           Column = 0;
           break;
         case '\r':
+          FormatTok->LastNewlineOffset = WhitespaceLength + i + 1;
+          Column = 0;
+          break;
         case '\f':
         case '\v':
           Column = 0;