mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-21 18:24:23 +00:00
Change the PassManager from a reference to a pointer.
The TargetPassManager's default constructor wants to initialize the PassManager to 'null'. But it's illegal to bind a null reference to a null l-value. Make the ivar a pointer instead. PR12468 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155902 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -207,7 +207,7 @@ TargetPassConfig::~TargetPassConfig() {
|
||||
// Out of line constructor provides default values for pass options and
|
||||
// registers all common codegen passes.
|
||||
TargetPassConfig::TargetPassConfig(TargetMachine *tm, PassManagerBase &pm)
|
||||
: ImmutablePass(ID), TM(tm), PM(pm), Impl(0), Initialized(false),
|
||||
: ImmutablePass(ID), TM(tm), PM(&pm), Impl(0), Initialized(false),
|
||||
DisableVerify(false),
|
||||
EnableTailMerge(true) {
|
||||
|
||||
@ -234,7 +234,7 @@ TargetPassConfig *LLVMTargetMachine::createPassConfig(PassManagerBase &PM) {
|
||||
}
|
||||
|
||||
TargetPassConfig::TargetPassConfig()
|
||||
: ImmutablePass(ID), PM(*(PassManagerBase*)0) {
|
||||
: ImmutablePass(ID), PM(0) {
|
||||
llvm_unreachable("TargetPassConfig should not be constructed on-the-fly");
|
||||
}
|
||||
|
||||
@ -269,16 +269,16 @@ AnalysisID TargetPassConfig::addPass(char &ID) {
|
||||
Pass *P = Pass::createPass(FinalID);
|
||||
if (!P)
|
||||
llvm_unreachable("Pass ID not registered");
|
||||
PM.add(P);
|
||||
PM->add(P);
|
||||
return FinalID;
|
||||
}
|
||||
|
||||
void TargetPassConfig::printAndVerify(const char *Banner) const {
|
||||
if (TM->shouldPrintMachineCode())
|
||||
PM.add(createMachineFunctionPrinterPass(dbgs(), Banner));
|
||||
PM->add(createMachineFunctionPrinterPass(dbgs(), Banner));
|
||||
|
||||
if (VerifyMachineCode)
|
||||
PM.add(createMachineVerifierPass(Banner));
|
||||
PM->add(createMachineVerifierPass(Banner));
|
||||
}
|
||||
|
||||
/// Add common target configurable passes that perform LLVM IR to IR transforms
|
||||
@ -288,46 +288,46 @@ void TargetPassConfig::addIRPasses() {
|
||||
// Add TypeBasedAliasAnalysis before BasicAliasAnalysis so that
|
||||
// BasicAliasAnalysis wins if they disagree. This is intended to help
|
||||
// support "obvious" type-punning idioms.
|
||||
PM.add(createTypeBasedAliasAnalysisPass());
|
||||
PM.add(createBasicAliasAnalysisPass());
|
||||
PM->add(createTypeBasedAliasAnalysisPass());
|
||||
PM->add(createBasicAliasAnalysisPass());
|
||||
|
||||
// Before running any passes, run the verifier to determine if the input
|
||||
// coming from the front-end and/or optimizer is valid.
|
||||
if (!DisableVerify)
|
||||
PM.add(createVerifierPass());
|
||||
PM->add(createVerifierPass());
|
||||
|
||||
// Run loop strength reduction before anything else.
|
||||
if (getOptLevel() != CodeGenOpt::None && !DisableLSR) {
|
||||
PM.add(createLoopStrengthReducePass(getTargetLowering()));
|
||||
PM->add(createLoopStrengthReducePass(getTargetLowering()));
|
||||
if (PrintLSR)
|
||||
PM.add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &dbgs()));
|
||||
PM->add(createPrintFunctionPass("\n\n*** Code after LSR ***\n", &dbgs()));
|
||||
}
|
||||
|
||||
PM.add(createGCLoweringPass());
|
||||
PM->add(createGCLoweringPass());
|
||||
|
||||
// Make sure that no unreachable blocks are instruction selected.
|
||||
PM.add(createUnreachableBlockEliminationPass());
|
||||
PM->add(createUnreachableBlockEliminationPass());
|
||||
}
|
||||
|
||||
/// Add common passes that perform LLVM IR to IR transforms in preparation for
|
||||
/// instruction selection.
|
||||
void TargetPassConfig::addISelPrepare() {
|
||||
if (getOptLevel() != CodeGenOpt::None && !DisableCGP)
|
||||
PM.add(createCodeGenPreparePass(getTargetLowering()));
|
||||
PM->add(createCodeGenPreparePass(getTargetLowering()));
|
||||
|
||||
PM.add(createStackProtectorPass(getTargetLowering()));
|
||||
PM->add(createStackProtectorPass(getTargetLowering()));
|
||||
|
||||
addPreISel();
|
||||
|
||||
if (PrintISelInput)
|
||||
PM.add(createPrintFunctionPass("\n\n"
|
||||
"*** Final LLVM Code input to ISel ***\n",
|
||||
&dbgs()));
|
||||
PM->add(createPrintFunctionPass("\n\n"
|
||||
"*** Final LLVM Code input to ISel ***\n",
|
||||
&dbgs()));
|
||||
|
||||
// All passes which modify the LLVM IR are now complete; run the verifier
|
||||
// to ensure that the IR is valid.
|
||||
if (!DisableVerify)
|
||||
PM.add(createVerifierPass());
|
||||
PM->add(createVerifierPass());
|
||||
}
|
||||
|
||||
/// Add the complete set of target-independent postISel code generator passes.
|
||||
@ -405,7 +405,7 @@ void TargetPassConfig::addMachinePasses() {
|
||||
// GC
|
||||
addPass(GCMachineCodeAnalysisID);
|
||||
if (PrintGCInfo)
|
||||
PM.add(createGCInfoPrinter(dbgs()));
|
||||
PM->add(createGCInfoPrinter(dbgs()));
|
||||
|
||||
// Basic block placement.
|
||||
if (getOptLevel() != CodeGenOpt::None)
|
||||
@ -522,7 +522,7 @@ void TargetPassConfig::addFastRegAlloc(FunctionPass *RegAllocPass) {
|
||||
addPass(PHIEliminationID);
|
||||
addPass(TwoAddressInstructionPassID);
|
||||
|
||||
PM.add(RegAllocPass);
|
||||
PM->add(RegAllocPass);
|
||||
printAndVerify("After Register Allocation");
|
||||
}
|
||||
|
||||
@ -564,7 +564,7 @@ void TargetPassConfig::addOptimizedRegAlloc(FunctionPass *RegAllocPass) {
|
||||
printAndVerify("After Machine Scheduling");
|
||||
|
||||
// Add the selected register allocation pass.
|
||||
PM.add(RegAllocPass);
|
||||
PM->add(RegAllocPass);
|
||||
printAndVerify("After Register Allocation");
|
||||
|
||||
// FinalizeRegAlloc is convenient until MachineInstrBundles is more mature,
|
||||
|
Reference in New Issue
Block a user