From 30c0cb2f30c49754ab8f8f778e70d8deac692f19 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Mon, 3 Sep 2012 02:30:13 +0000 Subject: [ms-inline asm] Update for the MatchInstruction API change in r163101. llvm-svn: 163102 --- clang/lib/Sema/SemaStmtAsm.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'clang/lib/Sema') diff --git a/clang/lib/Sema/SemaStmtAsm.cpp b/clang/lib/Sema/SemaStmtAsm.cpp index 14ea70b2924..bdd2cbce951 100644 --- a/clang/lib/Sema/SemaStmtAsm.cpp +++ b/clang/lib/Sema/SemaStmtAsm.cpp @@ -537,23 +537,25 @@ StmtResult Sema::ActOnMSAsmStmt(SourceLocation AsmLoc, Parser->ParseIdentifier(IDVal); // Canonicalize the opcode to lower case. - SmallString<128> Opcode; + SmallString<128> OpcodeStr; for (unsigned i = 0, e = IDVal.size(); i != e; ++i) - Opcode.push_back(tolower(IDVal[i])); + OpcodeStr.push_back(tolower(IDVal[i])); // Parse the operands. llvm::SMLoc IDLoc; SmallVector Operands; - bool HadError = TargetParser->ParseInstruction(Opcode.str(), IDLoc, + bool HadError = TargetParser->ParseInstruction(OpcodeStr.str(), IDLoc, Operands); // If we had an error parsing the operands, fail gracefully. if (HadError) { DEF_SIMPLE_MSASM; return Owned(NS); } // Match the MCInstr. + unsigned Kind; + unsigned Opcode; unsigned ErrorInfo; SmallVector Instrs; - HadError = TargetParser->MatchInstruction(IDLoc, Operands, Instrs, - ErrorInfo, + HadError = TargetParser->MatchInstruction(IDLoc, Kind, Opcode, Operands, + Instrs, ErrorInfo, /*matchingInlineAsm*/ true); // If we had an error parsing the operands, fail gracefully. if (HadError) { DEF_SIMPLE_MSASM; return Owned(NS); } -- cgit v1.2.3