Make MCContext in MachineModuleInfo unique_ptr instead.

Author: weiweichen

llvm/include/llvm/CodeGen/MachineModuleInfo.h

@@ -66,7 +66,7 @@ class MachineModuleInfoImpl {
 protected:
   /// Return the entries from a DenseMap in a deterministic sorted orer.
   /// Clears the map.
-  static SymbolListTy getSortedStubs(DenseMap<MCSymbol*, StubValueTy>&);
+  static SymbolListTy getSortedStubs(DenseMap<MCSymbol *, StubValueTy> &);
 
   /// Return the entries from a DenseMap in a deterministic sorted orer.
   /// Clears the map.
@@ -86,7 +86,7 @@ class MachineModuleInfo {
   const LLVMTargetMachine &TM;
 
   /// This is the MCContext used for the entire code generator.
-  MCContext Context;
+  std::unique_ptr<MCContext> Context;
   // This is an external context, that if assigned, will be used instead of the
   // internal context.
   MCContext *ExternalContext = nullptr;
@@ -100,7 +100,7 @@ class MachineModuleInfo {
   MachineModuleInfoImpl *ObjFileMMI;
 
   /// Maps IR Functions to their corresponding MachineFunctions.
-  DenseMap<const Function*, std::unique_ptr<MachineFunction>> MachineFunctions;
+  DenseMap<const Function *, std::unique_ptr<MachineFunction>> MachineFunctions;
   /// Next unique number available for a MachineFunction.
   unsigned NextFnNum = 0;
   const Function *LastRequest = nullptr; ///< Used for shortcut/cache.
@@ -124,10 +124,10 @@ class MachineModuleInfo {
   const LLVMTargetMachine &getTarget() const { return TM; }
 
   const MCContext &getContext() const {
-    return ExternalContext ? *ExternalContext : Context;
+    return ExternalContext ? *ExternalContext : *Context;
   }
   MCContext &getContext() {
-    return ExternalContext ? *ExternalContext : Context;
+    return ExternalContext ? *ExternalContext : *Context;
   }
 
   const Module *getModule() const { return TheModule; }
@@ -153,24 +153,21 @@ class MachineModuleInfo {
 
   /// Keep track of various per-module pieces of information for backends
   /// that would like to do so.
-  template<typename Ty>
-  Ty &getObjFileInfo() {
+  template <typename Ty> Ty &getObjFileInfo() {
     if (ObjFileMMI == nullptr)
       ObjFileMMI = new Ty(*this);
-    return *static_cast<Ty*>(ObjFileMMI);
+    return *static_cast<Ty *>(ObjFileMMI);
   }
 
-  template<typename Ty>
-  const Ty &getObjFileInfo() const {
-    return const_cast<MachineModuleInfo*>(this)->getObjFileInfo<Ty>();
+  template <typename Ty> const Ty &getObjFileInfo() const {
+    return const_cast<MachineModuleInfo *>(this)->getObjFileInfo<Ty>();
   }
 
   /// \}
 }; // End class MachineModuleInfo
 
 class MachineModuleInfoWrapperPass : public ImmutablePass {
-  std::unique_ptr<MachineModuleInfo> MMI =
-      std::make_unique<MachineModuleInfo>();
+  MachineModuleInfo MMI;
 
 public:
   static char ID; // Pass identification, replacement for typeid
@@ -183,8 +180,8 @@ class MachineModuleInfoWrapperPass : public ImmutablePass {
   bool doInitialization(Module &) override;
   bool doFinalization(Module &) override;
 
-  MachineModuleInfo &getMMI() { return *MMI; }
-  const MachineModuleInfo &getMMI() const { return *MMI; }
+  MachineModuleInfo &getMMI() { return MMI; }
+  const MachineModuleInfo &getMMI() const { return MMI; }
 };
 
 /// An analysis that produces \c MachineModuleInfo for a module.

llvm/lib/CodeGen/MachineModuleInfo.cpp

@@ -30,39 +30,39 @@ void MachineModuleInfo::initialize() {
 }
 
 void MachineModuleInfo::finalize() {
-  Context.reset();
+  if (Context)
+    Context->reset();
   // We don't clear the ExternalContext.
 
   delete ObjFileMMI;
   ObjFileMMI = nullptr;
 }
 
 MachineModuleInfo::MachineModuleInfo(MachineModuleInfo &&MMI)
-    : TM(std::move(MMI.TM)),
-      Context(TM.getTargetTriple(), TM.getMCAsmInfo(), TM.getMCRegisterInfo(),
-              TM.getMCSubtargetInfo(), nullptr, &TM.Options.MCOptions, false),
+    : TM(std::move(MMI.TM)), Context(std::move(MMI.Context)),
       MachineFunctions(std::move(MMI.MachineFunctions)) {
-  Context.setObjectFileInfo(TM.getObjFileLowering());
   ObjFileMMI = MMI.ObjFileMMI;
   ExternalContext = MMI.ExternalContext;
   TheModule = MMI.TheModule;
 }
 
 MachineModuleInfo::MachineModuleInfo(const LLVMTargetMachine *TM)
-    : TM(*TM), Context(TM->getTargetTriple(), TM->getMCAsmInfo(),
-                       TM->getMCRegisterInfo(), TM->getMCSubtargetInfo(),
-                       nullptr, &TM->Options.MCOptions, false) {
-  Context.setObjectFileInfo(TM->getObjFileLowering());
+    : TM(*TM),
+      Context(std::make_unique<MCContext>(
+          TM->getTargetTriple(), TM->getMCAsmInfo(), TM->getMCRegisterInfo(),
+          TM->getMCSubtargetInfo(), nullptr, &TM->Options.MCOptions, false)) {
+  Context->setObjectFileInfo(TM->getObjFileLowering());
   initialize();
 }
 
 MachineModuleInfo::MachineModuleInfo(const LLVMTargetMachine *TM,
                                      MCContext *ExtContext)
-    : TM(*TM), Context(TM->getTargetTriple(), TM->getMCAsmInfo(),
-                       TM->getMCRegisterInfo(), TM->getMCSubtargetInfo(),
-                       nullptr, &TM->Options.MCOptions, false),
+    : TM(*TM),
+      Context(std::make_unique<MCContext>(
+          TM->getTargetTriple(), TM->getMCAsmInfo(), TM->getMCRegisterInfo(),
+          TM->getMCSubtargetInfo(), nullptr, &TM->Options.MCOptions, false)),
       ExternalContext(ExtContext) {
-  Context.setObjectFileInfo(TM->getObjFileLowering());
+  Context->setObjectFileInfo(TM->getObjFileLowering());
   initialize();
 }
 
@@ -137,9 +137,7 @@ class FreeMachineFunction : public FunctionPass {
     return true;
   }
 
-  StringRef getPassName() const override {
-    return "Free MachineFunction";
-  }
+  StringRef getPassName() const override { return "Free MachineFunction"; }
 };
 
 } // end anonymous namespace
@@ -152,13 +150,13 @@ FunctionPass *llvm::createFreeMachineFunctionPass() {
 
 MachineModuleInfoWrapperPass::MachineModuleInfoWrapperPass(
     const LLVMTargetMachine *TM)
-    : ImmutablePass(ID), MMI(std::make_unique<MachineModuleInfo>(TM)) {
+    : ImmutablePass(ID), MMI(TM) {
   initializeMachineModuleInfoWrapperPassPass(*PassRegistry::getPassRegistry());
 }
 
 MachineModuleInfoWrapperPass::MachineModuleInfoWrapperPass(
     const LLVMTargetMachine *TM, MCContext *ExtContext)
-    : ImmutablePass(ID), MMI(std::make_unique<MachineModuleInfo>(TM, ExtContext)) {
+    : ImmutablePass(ID), MMI(TM) {
   initializeMachineModuleInfoWrapperPassPass(*PassRegistry::getPassRegistry());
 }
 
@@ -193,10 +191,10 @@ static uint64_t getLocCookie(const SMDiagnostic &SMD, const SourceMgr &SrcMgr,
 }
 
 bool MachineModuleInfoWrapperPass::doInitialization(Module &M) {
-  MMI->initialize();
-  MMI->TheModule = &M;
+  MMI.initialize();
+  MMI.TheModule = &M;
   LLVMContext &Ctx = M.getContext();
-  MMI->getContext().setDiagnosticHandler(
+  MMI.getContext().setDiagnosticHandler(
       [&Ctx, &M](const SMDiagnostic &SMD, bool IsInlineAsm,
                  const SourceMgr &SrcMgr,
                  std::vector<const MDNode *> &LocInfos) {
@@ -210,7 +208,7 @@ bool MachineModuleInfoWrapperPass::doInitialization(Module &M) {
 }
 
 bool MachineModuleInfoWrapperPass::doFinalization(Module &M) {
-  MMI->finalize();
+  MMI.finalize();
   return false;
 }