From ce17b0f5b805630bb71f99bfdf820e2c57a34f7e Mon Sep 17 00:00:00 2001
From: Chad Rosier <mcrosier@apple.com>
Date: Sat, 13 Oct 2012 00:26:22 +0000
Subject: [PATCH] Update for r165858.

llvm-svn: 165859
---
 clang/lib/Sema/SemaStmtAsm.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/clang/lib/Sema/SemaStmtAsm.cpp b/clang/lib/Sema/SemaStmtAsm.cpp
index f99c9834531b..017cdb90f620 100644
--- a/clang/lib/Sema/SemaStmtAsm.cpp
+++ b/clang/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); }