Update for r165858.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165859 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Sema/SemaStmtAsm.cpp b/lib/Sema/SemaStmtAsm.cpp
index f99c9834531b9859abd10898e61acbdffe373ce0..017cdb90f620b4b7c77bb26535d369bf55d1b069 100644 (file)
--- 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); }