Subzero. Refactoring.

src/IceTargetLoweringX8664.h

 //===- subzero/src/IceTargetLoweringX8664.h - lowering for x86-64 -*- 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 TargetX8664 final
     : public ::Ice::X86Internal::TargetX86Base<TargetX8664> {
   TargetX8664() = delete;
   TargetX8664(const TargetX8664 &) = delete;
   TargetX8664 &operator=(const TargetX8664 &) = delete;
 
   void emitJumpTable(const Cfg *Func,
                      const InstJumpTable *JumpTable) const override;
 
 public:
-  static TargetX8664 *create(Cfg *Func) { return new TargetX8664(Func); }
+  ~TargetX8664() = default;
+
+  static std::unique_ptr<::Ice::TargetLowering> create(Cfg *Func) {
+    return makeUnique<TargetX8664>(Func);
+  }
+
+  std::unique_ptr<::Ice::Assembler> createAssembler() const override {
+    return makeUnique<X8664::AssemblerX8664>();
+  }
 
 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<TargetX8664>;
 
   explicit TargetX8664(Cfg *Func)
       : ::Ice::X86Internal::TargetX86Base<TargetX8664>(Func) {}
 
   Operand *createNaClReadTPSrcOperand() {
     Variable *TDB = makeReg(IceType_i32);
     InstCall *Call = makeHelperCall(H_call_read_tp, TDB, 0);
     lowerCall(Call);
     return TDB;
@@ skipping 35 matching lines @@
 
   static std::unique_ptr<TargetHeaderLowering> create(GlobalContext *Ctx) {
     return makeUnique<TargetHeaderX8664>(Ctx);
   }
 
 private:
   ENABLE_MAKE_UNIQUE;
 
   explicit TargetHeaderX8664(GlobalContext *Ctx) : TargetHeaderLowering(Ctx) {}
 };
+
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICETARGETLOWERINGX8664_H