diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/Parse/ParseStmt.cpp | 21 | ||||
| -rw-r--r-- | clang/test/Sema/ms-fuzzy-asm.c | 10 |
2 files changed, 26 insertions, 5 deletions
diff --git a/clang/Parse/ParseStmt.cpp b/clang/Parse/ParseStmt.cpp index 7da47e84f2b..4be3f1e40a9 100644 --- a/clang/Parse/ParseStmt.cpp +++ b/clang/Parse/ParseStmt.cpp @@ -921,11 +921,22 @@ Parser::StmtResult Parser::FuzzyParseMicrosoftAsmStatement() { // 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; } diff --git a/clang/test/Sema/ms-fuzzy-asm.c b/clang/test/Sema/ms-fuzzy-asm.c new file mode 100644 index 00000000000..7c24985b6c5 --- /dev/null +++ b/clang/test/Sema/ms-fuzzy-asm.c @@ -0,0 +1,10 @@ +// RUN: clang %s -verify -fms-extensions + +#define M __asm int 0x2c +#define M2 int + +void t1(void) { M } +void t2(void) { __asm int 0x2c } +// FIXME? We don't support fuzzy parsing line-oriented __asm's where the body is partially defined in a macro. +void t3(void) { __asm M2 0x2c } // expected-error{{expected ';' after expression}} expected-warning{{expression result unused}} + |
