diff options
author | Chad Rosier <mcrosier@apple.com> | 2012-09-03 02:30:13 +0000 |
---|---|---|
committer | Chad Rosier <mcrosier@apple.com> | 2012-09-03 02:30:13 +0000 |
commit | be5c3fbec3a430bab2524e9315f58f64815bfeaf (patch) | |
tree | 28fa8a66704bbb30805488b5077af6fe90d253e8 /lib/Sema/SemaStmtAsm.cpp | |
parent | ac067454ad828f6cefe98fb3b02e84295396a495 (diff) |
[ms-inline asm] Update for the MatchInstruction API change in r163101.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@163102 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaStmtAsm.cpp')
-rw-r--r-- | lib/Sema/SemaStmtAsm.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/Sema/SemaStmtAsm.cpp b/lib/Sema/SemaStmtAsm.cpp index 14ea70b292..bdd2cbce95 100644 --- a/lib/Sema/SemaStmtAsm.cpp +++ b/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<llvm::MCParsedAsmOperand*, 8> 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<llvm::MCInst, 2> 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); } |