Remove the UseCFI option from createAsmStreamer.

We were already always passing true, this just removes the option.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208205 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-05-07 13:00:43 +00:00
parent fe0b2279a8
commit 2842c051b3
11 changed files with 30 additions and 46 deletions

View File

@ -758,10 +758,9 @@ MCStreamer *createNullStreamer(MCContext &Ctx);
/// \param ShowInst - Whether to show the MCInst representation inline with /// \param ShowInst - Whether to show the MCInst representation inline with
/// the assembly. /// the assembly.
MCStreamer *createAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, MCStreamer *createAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool isVerboseAsm, bool useDwarfDirectory,
bool useDwarfDirectory, MCInstPrinter *InstPrint, MCInstPrinter *InstPrint, MCCodeEmitter *CE,
MCCodeEmitter *CE, MCAsmBackend *TAB, MCAsmBackend *TAB, bool ShowInst);
bool ShowInst);
/// createMachOStreamer - Create a machine code streamer which will generate /// createMachOStreamer - Create a machine code streamer which will generate
/// Mach-O format object files. /// Mach-O format object files.

View File

@ -52,8 +52,7 @@ namespace llvm {
class formatted_raw_ostream; class formatted_raw_ostream;
MCStreamer *createAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, MCStreamer *createAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool isVerboseAsm, bool useDwarfDirectory,
bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCCodeEmitter *CE, MCInstPrinter *InstPrint, MCCodeEmitter *CE,
MCAsmBackend *TAB, bool ShowInst); MCAsmBackend *TAB, bool ShowInst);
@ -135,7 +134,6 @@ namespace llvm {
typedef MCStreamer *(*AsmStreamerCtorTy)(MCContext &Ctx, typedef MCStreamer *(*AsmStreamerCtorTy)(MCContext &Ctx,
formatted_raw_ostream &OS, formatted_raw_ostream &OS,
bool isVerboseAsm, bool isVerboseAsm,
bool useCFI,
bool useDwarfDirectory, bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCInstPrinter *InstPrint,
MCCodeEmitter *CE, MCCodeEmitter *CE,
@ -437,19 +435,16 @@ namespace llvm {
MCStreamer *createAsmStreamer(MCContext &Ctx, MCStreamer *createAsmStreamer(MCContext &Ctx,
formatted_raw_ostream &OS, formatted_raw_ostream &OS,
bool isVerboseAsm, bool isVerboseAsm,
bool useCFI,
bool useDwarfDirectory, bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCInstPrinter *InstPrint,
MCCodeEmitter *CE, MCCodeEmitter *CE,
MCAsmBackend *TAB, MCAsmBackend *TAB,
bool ShowInst) const { bool ShowInst) const {
if (AsmStreamerCtorFn) if (AsmStreamerCtorFn)
return AsmStreamerCtorFn(Ctx, OS, isVerboseAsm, useCFI, return AsmStreamerCtorFn(Ctx, OS, isVerboseAsm, useDwarfDirectory,
useDwarfDirectory, InstPrint, CE, TAB, InstPrint, CE, TAB, ShowInst);
ShowInst); return llvm::createAsmStreamer(Ctx, OS, isVerboseAsm, useDwarfDirectory,
return llvm::createAsmStreamer(Ctx, OS, isVerboseAsm, useCFI, InstPrint, CE, TAB, ShowInst);
useDwarfDirectory, InstPrint, CE, TAB,
ShowInst);
} }
/// createMCRelocationInfo - Create a target specific MCRelocationInfo. /// createMCRelocationInfo - Create a target specific MCRelocationInfo.

View File

@ -193,7 +193,6 @@ bool LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM,
TargetCPU); TargetCPU);
MCStreamer *S = getTarget().createAsmStreamer(*Context, Out, MCStreamer *S = getTarget().createAsmStreamer(*Context, Out,
getVerboseAsm(), getVerboseAsm(),
hasMCUseCFI(),
hasMCUseDwarfDirectory(), hasMCUseDwarfDirectory(),
InstPrinter, InstPrinter,
MCE, MAB, MCE, MAB,

View File

@ -1468,10 +1468,9 @@ void MCAsmStreamer::FinishImpl() {
MCStreamer *llvm::createAsmStreamer(MCContext &Context, MCStreamer *llvm::createAsmStreamer(MCContext &Context,
formatted_raw_ostream &OS, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool isVerboseAsm, bool useDwarfDirectory,
bool useDwarfDirectory, MCInstPrinter *IP, MCInstPrinter *IP, MCCodeEmitter *CE,
MCCodeEmitter *CE, MCAsmBackend *MAB, MCAsmBackend *MAB, bool ShowInst) {
bool ShowInst) { return new MCAsmStreamer(Context, OS, isVerboseAsm, true, useDwarfDirectory,
return new MCAsmStreamer(Context, OS, isVerboseAsm, useCFI, useDwarfDirectory,
IP, CE, MAB, ShowInst); IP, CE, MAB, ShowInst);
} }

View File

@ -1313,13 +1313,11 @@ void ARMELFStreamer::emitUnwindRaw(int64_t Offset,
namespace llvm { namespace llvm {
MCStreamer *createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, MCStreamer *createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool isVerboseAsm, bool useDwarfDirectory,
bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCCodeEmitter *CE, MCInstPrinter *InstPrint, MCCodeEmitter *CE,
MCAsmBackend *TAB, bool ShowInst) { MCAsmBackend *TAB, bool ShowInst) {
MCStreamer *S = MCStreamer *S = llvm::createAsmStreamer(
llvm::createAsmStreamer(Ctx, OS, isVerboseAsm, useCFI, useDwarfDirectory, Ctx, OS, isVerboseAsm, useDwarfDirectory, InstPrint, CE, TAB, ShowInst);
InstPrint, CE, TAB, ShowInst);
new ARMTargetAsmStreamer(*S, OS, *InstPrint, isVerboseAsm); new ARMTargetAsmStreamer(*S, OS, *InstPrint, isVerboseAsm);
return S; return S;
} }

View File

@ -47,8 +47,7 @@ namespace ARM_MC {
} }
MCStreamer *createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, MCStreamer *createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool isVerboseAsm, bool useDwarfDirectory,
bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCCodeEmitter *CE, MCInstPrinter *InstPrint, MCCodeEmitter *CE,
MCAsmBackend *TAB, bool ShowInst); MCAsmBackend *TAB, bool ShowInst);

View File

@ -124,12 +124,11 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
static MCStreamer * static MCStreamer *
createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool useDwarfDirectory, bool isVerboseAsm, bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCCodeEmitter *CE, MCInstPrinter *InstPrint, MCCodeEmitter *CE,
MCAsmBackend *TAB, bool ShowInst) { MCAsmBackend *TAB, bool ShowInst) {
MCStreamer *S = MCStreamer *S = llvm::createAsmStreamer(
llvm::createAsmStreamer(Ctx, OS, isVerboseAsm, useCFI, useDwarfDirectory, Ctx, OS, isVerboseAsm, useDwarfDirectory, InstPrint, CE, TAB, ShowInst);
InstPrint, CE, TAB, ShowInst);
new MipsTargetAsmStreamer(*S, OS); new MipsTargetAsmStreamer(*S, OS);
return S; return S;
} }

View File

@ -175,13 +175,12 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
static MCStreamer * static MCStreamer *
createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool useDwarfDirectory, bool isVerboseAsm, bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCCodeEmitter *CE, MCInstPrinter *InstPrint, MCCodeEmitter *CE,
MCAsmBackend *TAB, bool ShowInst) { MCAsmBackend *TAB, bool ShowInst) {
MCStreamer *S = MCStreamer *S = llvm::createAsmStreamer(
llvm::createAsmStreamer(Ctx, OS, isVerboseAsm, useCFI, useDwarfDirectory, Ctx, OS, isVerboseAsm, useDwarfDirectory, InstPrint, CE, TAB, ShowInst);
InstPrint, CE, TAB, ShowInst);
new PPCTargetAsmStreamer(*S, OS); new PPCTargetAsmStreamer(*S, OS);
return S; return S;
} }

View File

@ -135,13 +135,12 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
static MCStreamer * static MCStreamer *
createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, createMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool useDwarfDirectory, bool isVerboseAsm, bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCCodeEmitter *CE, MCInstPrinter *InstPrint, MCCodeEmitter *CE,
MCAsmBackend *TAB, bool ShowInst) { MCAsmBackend *TAB, bool ShowInst) {
MCStreamer *S = MCStreamer *S = llvm::createAsmStreamer(
llvm::createAsmStreamer(Ctx, OS, isVerboseAsm, useCFI, useDwarfDirectory, Ctx, OS, isVerboseAsm, useDwarfDirectory, InstPrint, CE, TAB, ShowInst);
InstPrint, CE, TAB, ShowInst);
new SparcTargetAsmStreamer(*S, OS); new SparcTargetAsmStreamer(*S, OS);
return S; return S;
} }

View File

@ -128,12 +128,11 @@ void XCoreTargetAsmStreamer::emitCCBottomFunction(StringRef Name) {
static MCStreamer * static MCStreamer *
createXCoreMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS, createXCoreMCAsmStreamer(MCContext &Ctx, formatted_raw_ostream &OS,
bool isVerboseAsm, bool useCFI, bool useDwarfDirectory, bool isVerboseAsm, bool useDwarfDirectory,
MCInstPrinter *InstPrint, MCCodeEmitter *CE, MCInstPrinter *InstPrint, MCCodeEmitter *CE,
MCAsmBackend *TAB, bool ShowInst) { MCAsmBackend *TAB, bool ShowInst) {
MCStreamer *S = MCStreamer *S = llvm::createAsmStreamer(
llvm::createAsmStreamer(Ctx, OS, isVerboseAsm, useCFI, useDwarfDirectory, Ctx, OS, isVerboseAsm, useDwarfDirectory, InstPrint, CE, TAB, ShowInst);
InstPrint, CE, TAB, ShowInst);
new XCoreTargetAsmStreamer(*S, OS); new XCoreTargetAsmStreamer(*S, OS);
return S; return S;
} }

View File

@ -455,9 +455,8 @@ int main(int argc, char **argv) {
MAB = TheTarget->createMCAsmBackend(*MRI, TripleName, MCPU); MAB = TheTarget->createMCAsmBackend(*MRI, TripleName, MCPU);
} }
Str.reset(TheTarget->createAsmStreamer(Ctx, FOS, /*asmverbose*/ true, Str.reset(TheTarget->createAsmStreamer(Ctx, FOS, /*asmverbose*/ true,
/*UseCFI*/ true, /*useDwarfDirectory*/ true, IP, CE,
/*useDwarfDirectory*/ MAB, ShowInst));
true, IP, CE, MAB, ShowInst));
} else if (FileType == OFT_Null) { } else if (FileType == OFT_Null) {
Str.reset(createNullStreamer(Ctx)); Str.reset(createNullStreamer(Ctx));