Don't get confused on the number of braces when braces start after the first __asm

[• ehsan]

Summary

Without this, we would not consume the closing brace which would cause
the parser to start consuming C++ and bad things would happen.

[rnk]

lgtm, nice catch

[• ehsan]

Closed by commit rL213032 (authored by @ehsan).

cfe/trunk/lib/Parse/ParseStmtAsm.cpp

 ///         ms-asm-line '\n' ms-asm-instruction-block
 ///
 StmtResult Parser::ParseMicrosoftAsmStatement(SourceLocation AsmLoc) {
   SourceManager &SrcMgr = PP.getSourceManager();
   SourceLocation EndLoc = AsmLoc;
   SmallVector<Token, 4> AsmToks;
 
   unsigned BraceNesting = 0;
-  unsigned short savedBraceCount = 0;
+  unsigned short savedBraceCount = BraceCount;
   bool InAsmComment = false;
   FileID FID;
   unsigned LineNo = 0;
   unsigned NumTokensRead = 0;
   SmallVector<SourceLocation, 4> LBraceLocs;
   bool SkippedStartOfLine = false;
 
   if (Tok.is(tok::l_brace)) {
     // Braced inline asm: consume the opening brace.
     BraceNesting = 1;
-    savedBraceCount = BraceCount;
     EndLoc = ConsumeBrace();
     LBraceLocs.push_back(EndLoc);
     ++NumTokensRead;
   } else {
     // Single-line inline asm; compute which line it is on.
     std::pair<FileID, unsigned> ExpAsmLoc =
         SrcMgr.getDecomposedExpansionLoc(EndLoc);
     FID = ExpAsmLoc.first;

cfe/trunk/test/Parser/ms-inline-asm.c

__asm {
     __asm {
       mov eax, 1
       {
         mov eax, 2
       }
     }
   }
 }
+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}}