[cfe-commits] r165859 - /cfe/trunk/lib/Sema/SemaStmtAsm.cpp

[Chad Rosier]

Author: mcrosier
Date: Fri Oct 12 19:26:22 2012
New Revision: 165859

URL: http://llvm.org/viewvc/llvm-project?rev=165859&view=rev
Log:
Update for r165858.

Modified:
    cfe/trunk/lib/Sema/SemaStmtAsm.cpp

Modified: cfe/trunk/lib/Sema/SemaStmtAsm.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmtAsm.cpp?rev=165859&r1=165858&r2=165859&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaStmtAsm.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmtAsm.cpp Fri Oct 12 19:26:22 2012
@@ -456,6 +456,7 @@
     // Change to the Intel dialect.
     Parser->setAssemblerDialect(1);
     Parser->setTargetParser(*TargetParser.get());
+    Parser->setParsingInlineAsm(true);
 
     // Prime the lexer.
     Parser->Lex();
@@ -482,9 +483,9 @@
     // 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); }