diff options
| author | Joey Gouly <joey.gouly@arm.com> | 2013-09-12 10:59:24 +0000 |
|---|---|---|
| committer | Joey Gouly <joey.gouly@arm.com> | 2013-09-12 10:59:24 +0000 |
| commit | 92dfcfa4037f233a5d0369e7cff2b6734aab2d76 (patch) | |
| tree | 347d43fce1823185043f0679b0d1c8d205116a70 /clang | |
| parent | c2293fc7f276d8e237ef82f164016e7be7a0a6cd (diff) | |
| download | bcm5719-llvm-92dfcfa4037f233a5d0369e7cff2b6734aab2d76.tar.gz bcm5719-llvm-92dfcfa4037f233a5d0369e7cff2b6734aab2d76.zip | |
Fix the MCTargetAsmParser API change.
llvm-svn: 190601
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Parse/ParseStmt.cpp | 6 | ||||
| -rw-r--r-- | clang/tools/driver/cc1as_main.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp index 16da1e0c9dc..b74ab255691 100644 --- a/clang/lib/Parse/ParseStmt.cpp +++ b/clang/lib/Parse/ParseStmt.cpp @@ -2091,6 +2091,8 @@ StmtResult Parser::ParseMicrosoftAsmStatement(SourceLocation AsmLoc) { OwningPtr<llvm::MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TT)); OwningPtr<llvm::MCAsmInfo> MAI(TheTarget->createMCAsmInfo(*MRI, TT)); + // Get the instruction descriptor. + const llvm::MCInstrInfo *MII = TheTarget->createMCInstrInfo(); OwningPtr<llvm::MCObjectFileInfo> MOFI(new llvm::MCObjectFileInfo()); OwningPtr<llvm::MCSubtargetInfo> STI(TheTarget->createMCSubtargetInfo(TT, "", "")); @@ -2107,10 +2109,8 @@ StmtResult Parser::ParseMicrosoftAsmStatement(SourceLocation AsmLoc) { OwningPtr<llvm::MCAsmParser> Parser(createMCAsmParser(TempSrcMgr, Ctx, *Str.get(), *MAI)); OwningPtr<llvm::MCTargetAsmParser> - TargetParser(TheTarget->createMCAsmParser(*STI, *Parser)); + TargetParser(TheTarget->createMCAsmParser(*STI, *Parser, *MII)); - // Get the instruction descriptor. - const llvm::MCInstrInfo *MII = TheTarget->createMCInstrInfo(); llvm::MCInstPrinter *IP = TheTarget->createMCInstPrinter(1, *MAI, *MII, *MRI, *STI); diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp index cf04116bb45..80ab1ab22e9 100644 --- a/clang/tools/driver/cc1as_main.cpp +++ b/clang/tools/driver/cc1as_main.cpp @@ -366,7 +366,7 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts, OwningPtr<MCAsmParser> Parser(createMCAsmParser(SrcMgr, Ctx, *Str.get(), *MAI)); - OwningPtr<MCTargetAsmParser> TAP(TheTarget->createMCAsmParser(*STI, *Parser)); + OwningPtr<MCTargetAsmParser> TAP(TheTarget->createMCAsmParser(*STI, *Parser, *MCII)); if (!TAP) { Diags.Report(diag::err_target_unknown_triple) << Opts.Triple; return false; |
