Subzero. Refactoring.

src/IceTargetLoweringX8632.h

 //===- subzero/src/IceTargetLoweringX8632.h - x86-32 lowering ---*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 18 matching lines @@
 class TargetX8632 final
     : public ::Ice::X86Internal::TargetX86Base<TargetX8632> {
   TargetX8632() = delete;
   TargetX8632(const TargetX8632 &) = delete;
   TargetX8632 &operator=(const TargetX8632 &) = delete;
 
   void emitJumpTable(const Cfg *Func,
                      const InstJumpTable *JumpTable) const override;
 
 public:
-  using X86InstructionSet = X8632::Traits::InstructionSet;
+  ~TargetX8632() = default;
 
-  static TargetX8632 *create(Cfg *Func) { return new TargetX8632(Func); }
+  static std::unique_ptr<::Ice::TargetLowering> create(Cfg *Func) {
+    return makeUnique<TargetX8632>(Func);
+  }
+
+  std::unique_ptr<::Ice::Assembler> createAssembler() const override {
+    return makeUnique<X8632::AssemblerX8632>();
+  }
 
 protected:
   void lowerCall(const InstCall *Instr) override;
   void lowerArguments() override;
   void lowerRet(const InstRet *Inst) override;
   void addProlog(CfgNode *Node) override;
   void addEpilog(CfgNode *Node) override;
 
 private:
+  ENABLE_MAKE_UNIQUE;
   friend class ::Ice::X86Internal::TargetX86Base<TargetX8632>;
 
   Operand *createNaClReadTPSrcOperand() {
     Constant *Zero = Ctx->getConstantZero(IceType_i32);
     return Traits::X86OperandMem::create(Func, IceType_i32, nullptr, Zero,
                                          nullptr, 0,
                                          Traits::X86OperandMem::SegReg_GS);
   }
 
   explicit TargetX8632(Cfg *Func) : TargetX86Base(Func) {}
@@ skipping 36 matching lines @@
 protected:
   explicit TargetHeaderX8632(GlobalContext *Ctx);
 
 private:
   ~TargetHeaderX8632() = default;
 };
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX8632_H