Skip to content

wip [CodeGen] MachineModuleInfo: Take Target as a reference (NFC) #132357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
optimisan wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

wip [CodeGen] MachineModuleInfo: Take Target as a reference (NFC) #132357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions llvm/include/llvm/CodeGen/MachineModuleInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ class MachineModuleInfo {
MachineModuleInfo &operator=(MachineModuleInfo &&MMII) = delete;

public:
explicit MachineModuleInfo(const TargetMachine *TM = nullptr);
explicit MachineModuleInfo(const TargetMachine &TM);

explicit MachineModuleInfo(const TargetMachine *TM, MCContext *ExtContext);
explicit MachineModuleInfo(const TargetMachine &TM, MCContext *ExtContext);

MachineModuleInfo(MachineModuleInfo &&MMII);

Expand Down
24 changes: 12 additions & 12 deletions llvm/lib/CodeGen/MachineModuleInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ MachineModuleInfo::MachineModuleInfo(MachineModuleInfo &&MMI)
TheModule = MMI.TheModule;
}

MachineModuleInfo::MachineModuleInfo(const TargetMachine *TM)
: TM(*TM), Context(TM->getTargetTriple(), TM->getMCAsmInfo(),
TM->getMCRegisterInfo(), TM->getMCSubtargetInfo(),
nullptr, &TM->Options.MCOptions, false) {
Context.setObjectFileInfo(TM->getObjFileLowering());
MachineModuleInfo::MachineModuleInfo(const TargetMachine &TM)
: TM(TM),
Context(TM.getTargetTriple(), TM.getMCAsmInfo(), TM.getMCRegisterInfo(),
TM.getMCSubtargetInfo(), nullptr, &TM.Options.MCOptions, false) {
Context.setObjectFileInfo(TM.getObjFileLowering());
initialize();
}

MachineModuleInfo::MachineModuleInfo(const TargetMachine *TM,
MachineModuleInfo::MachineModuleInfo(const TargetMachine &TM,
MCContext *ExtContext)
: TM(*TM), Context(TM->getTargetTriple(), TM->getMCAsmInfo(),
TM->getMCRegisterInfo(), TM->getMCSubtargetInfo(),
nullptr, &TM->Options.MCOptions, false),
: TM(TM),
Context(TM.getTargetTriple(), TM.getMCAsmInfo(), TM.getMCRegisterInfo(),
TM.getMCSubtargetInfo(), nullptr, &TM.Options.MCOptions, false),
ExternalContext(ExtContext) {
Context.setObjectFileInfo(TM->getObjFileLowering());
Context.setObjectFileInfo(TM.getObjFileLowering());
initialize();
}

Expand Down Expand Up @@ -152,13 +152,13 @@ FunctionPass *llvm::createFreeMachineFunctionPass() {

MachineModuleInfoWrapperPass::MachineModuleInfoWrapperPass(
const TargetMachine *TM)
: ImmutablePass(ID), MMI(TM) {
: ImmutablePass(ID), MMI(*TM) {
initializeMachineModuleInfoWrapperPassPass(*PassRegistry::getPassRegistry());
}

MachineModuleInfoWrapperPass::MachineModuleInfoWrapperPass(
const TargetMachine *TM, MCContext *ExtContext)
: ImmutablePass(ID), MMI(TM, ExtContext) {
: ImmutablePass(ID), MMI(*TM, ExtContext) {
initializeMachineModuleInfoWrapperPassPass(*PassRegistry::getPassRegistry());
}

Expand Down
2 changes: 1 addition & 1 deletion llvm/tools/llc/NewPMDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ int llvm::compileModuleWithNewPM(
Opt.DebugPM = DebugPM;
Opt.RegAlloc = RegAlloc;

MachineModuleInfo MMI(Target.get());
MachineModuleInfo MMI(*Target);

PassInstrumentationCallbacks PIC;
StandardInstrumentations SI(Context, Opt.DebugPM,
Expand Down
2 changes: 1 addition & 1 deletion llvm/tools/llvm-reduce/ReducerWorkItem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ ReducerWorkItem::clone(const TargetMachine *TM) const {
// MachineModuleInfo contains a lot of other state used during codegen which
// we won't be using here, but we should be able to ignore it (although this
// is pretty ugly).
CloneMMM->MMI = std::make_unique<MachineModuleInfo>(TM);
CloneMMM->MMI = std::make_unique<MachineModuleInfo>(*TM);

for (const Function &F : getModule()) {
if (auto *MF = MMI->getMachineFunction(F))
Expand Down
Loading