diff options
| -rw-r--r-- | clang/lib/Parse/ParseStmtAsm.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Parser/ms-inline-asm.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseStmtAsm.cpp b/clang/lib/Parse/ParseStmtAsm.cpp index de299fd5c4a..f66121b1ec7 100644 --- a/clang/lib/Parse/ParseStmtAsm.cpp +++ b/clang/lib/Parse/ParseStmtAsm.cpp @@ -323,7 +323,7 @@ StmtResult Parser::ParseMicrosoftAsmStatement(SourceLocation AsmLoc) { SmallVector<Token, 4> AsmToks; unsigned BraceNesting = 0; - unsigned short savedBraceCount = 0; + unsigned short savedBraceCount = BraceCount; bool InAsmComment = false; FileID FID; unsigned LineNo = 0; @@ -334,7 +334,6 @@ StmtResult Parser::ParseMicrosoftAsmStatement(SourceLocation AsmLoc) { if (Tok.is(tok::l_brace)) { // Braced inline asm: consume the opening brace. BraceNesting = 1; - savedBraceCount = BraceCount; EndLoc = ConsumeBrace(); LBraceLocs.push_back(EndLoc); ++NumTokensRead; diff --git a/clang/test/Parser/ms-inline-asm.c b/clang/test/Parser/ms-inline-asm.c index 564f0081d38..00508f5cf09 100644 --- a/clang/test/Parser/ms-inline-asm.c +++ b/clang/test/Parser/ms-inline-asm.c @@ -45,6 +45,9 @@ void t10() { } } } +void t11() { + do { __asm mov eax, 0 __asm { __asm mov edx, 1 } } while(0); +} int t_fail() { // expected-note {{to match this}} __asm __asm { // expected-error 3 {{expected}} expected-note {{to match this}} |
