summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-05-11 11:59:46 +0000
committerDaniel Jasper <djasper@google.com>2015-05-11 11:59:46 +0000
commit790d4f975e0691215701b4f74b90e2b7a96ef65e (patch)
tree6d41b0f3b821a2604bbea1941d744d95fee18f3f /clang/lib/Format
parent88504598c332fde335896dbf0cb3431731480685 (diff)
downloadbcm5719-llvm-790d4f975e0691215701b4f74b90e2b7a96ef65e.tar.gz
bcm5719-llvm-790d4f975e0691215701b4f74b90e2b7a96ef65e.zip
clang-format: Don't merge subsequent lines into _asm blocks.
Before: _asm { } int i; After: _asm { } int i; llvm-svn: 236985
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/UnwrappedLineParser.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index a2afcc0fd5b..6dee251a918 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -672,6 +672,7 @@ void UnwrappedLineParser::parseStructuralElement() {
if (FormatTok->is(tok::r_brace)) {
FormatTok->Type = TT_InlineASMBrace;
nextToken();
+ addUnwrappedLine();
break;
}
FormatTok->Finalized = true;
OpenPOWER on IntegriCloud