diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-10-13 00:26:22 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-10-13 00:26:22 +0000 |
| commit | 67bd78f1d52da57f9f44092816174ccc1d599c87 (patch) | |
| tree | f7b8a41ebe2d2e8834876ab1b7f594ed33cfa6a0 /lib/Sema/SemaStmtAsm.cpp | |
| parent | de31b28eb7d982ed6802986c2ea94b4e955c5366 (diff) | |
Update for r165858.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165859 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaStmtAsm.cpp')
| -rw-r--r-- | lib/Sema/SemaStmtAsm.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Sema/SemaStmtAsm.cpp b/lib/Sema/SemaStmtAsm.cpp index f99c983453..017cdb90f6 100644 --- a/lib/Sema/SemaStmtAsm.cpp +++ b/lib/Sema/SemaStmtAsm.cpp @@ -456,6 +456,7 @@ StmtResult Sema::ActOnMSAsmStmt(SourceLocation AsmLoc, SourceLocation LBraceLoc, // Change to the Intel dialect. Parser->setAssemblerDialect(1); Parser->setTargetParser(*TargetParser.get()); + Parser->setParsingInlineAsm(true); // Prime the lexer. Parser->Lex(); @@ -482,9 +483,9 @@ StmtResult Sema::ActOnMSAsmStmt(SourceLocation AsmLoc, SourceLocation LBraceLoc, // Match the MCInstr. unsigned Opcode; unsigned ErrorInfo; - HadError = TargetParser->MatchInstruction(IDLoc, Operands, *Str.get(), - Opcode, ErrorInfo, - /*matchingInlineAsm*/ true); + HadError = TargetParser->MatchAndEmitInstruction(IDLoc, Opcode, Operands, + *Str.get(), ErrorInfo, + /*MatchingInlineAsm*/ true); // If we had an error parsing the operands, fail gracefully. if (HadError) { DEF_SIMPLE_MSASM(EmptyAsmStr); return Owned(NS); } |