Support fuzzy parsing MS line-oriented __asm's that originate from a macro (a case where we can't obtain source line info). As the test case indicates, we don't currently support line-oriented asm statements that mix file/macro body tokens.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46878 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Parse/ParseStmt.cpp b/Parse/ParseStmt.cpp
index 7da47e8..4be3f1e 100644
--- a/Parse/ParseStmt.cpp
+++ b/Parse/ParseStmt.cpp
@@ -921,11 +921,22 @@
// From the MS website: If used without braces, the __asm keyword means
// that the rest of the line is an assembly-language statement.
SourceManager &SrcMgr = PP.getSourceManager();
- unsigned lineNo = SrcMgr.getLineNumber(Tok.getLocation());
- do {
- ConsumeAnyToken();
- } while ((SrcMgr.getLineNumber(Tok.getLocation()) == lineNo) &&
- Tok.isNot(tok::r_brace) && Tok.isNot(tok::eof));
+ SourceLocation TokLoc = Tok.getLocation();
+ if (TokLoc.isFileID()) {
+ unsigned lineNo = SrcMgr.getLineNumber(TokLoc);
+ do {
+ ConsumeAnyToken();
+ TokLoc = Tok.getLocation();
+ } while (TokLoc.isFileID() && (SrcMgr.getLineNumber(TokLoc) == lineNo) &&
+ Tok.isNot(tok::r_brace) && Tok.isNot(tok::semi) &&
+ Tok.isNot(tok::eof));
+ } else { // The asm tokens come from a macro expansion.
+ do {
+ ConsumeAnyToken();
+ TokLoc = Tok.getLocation();
+ } while (TokLoc.isMacroID() && Tok.isNot(tok::r_brace) &&
+ Tok.isNot(tok::semi) && Tok.isNot(tok::eof));
+ }
}
return false;
}