Merge x86 data and header lowering

src/IceTargetLoweringX8664.h

Index: src/IceTargetLoweringX8664.h
diff --git a/src/IceTargetLoweringX8664.h b/src/IceTargetLoweringX8664.h
index 0a3cdef8d0a66a873babe36aec9a495b087b9dd0..7ab30255d2fcf69a5f25eef89b99bec9a58de485 100644
--- a/src/IceTargetLoweringX8664.h
+++ b/src/IceTargetLoweringX8664.h
@@ -34,9 +34,6 @@ class TargetX8664 final : public X8664::TargetX86Base<X8664::Traits> {
   TargetX8664(const TargetX8664 &) = delete;
   TargetX8664 &operator=(const TargetX8664 &) = delete;
 
-  void emitJumpTable(const Cfg *Func,
-                     const InstJumpTable *JumpTable) const override;
-
 public:
   ~TargetX8664() = default;
 
@@ -49,12 +46,9 @@ public:
     return makeUnique<X8664::AssemblerX8664>(EmitAddrSizeOverridePrefix);
   }
 
-  bool needSandboxing() const { return NeedSandboxing; }
-
 protected:
   void _add_sp(Operand *Adjustment);
   void _mov_sp(Operand *NewValue);
-  void _push_rbp();
   Traits::X86OperandMem *_sandbox_mem_reference(X86OperandMem *Mem);
   void _sub_sp(Operand *Adjustment);
   void _link_bp();
@@ -72,8 +66,9 @@ private:
   ENABLE_MAKE_UNIQUE;
   friend class X8664::TargetX86Base<X8664::Traits>;
 
-  explicit TargetX8664(Cfg *Func)
-      : ::Ice::X8664::TargetX86Base<X8664::Traits>(Func) {}
+  explicit TargetX8664(Cfg *Func) : TargetX86Base(Func) {}
+
+  void _push_rbp();
 
   Operand *createNaClReadTPSrcOperand() {
     Variable *TDB = makeReg(IceType_i32);
@@ -83,49 +78,6 @@ private:
   }
 };
 
-class TargetDataX8664 : public TargetDataLowering {
-  TargetDataX8664() = delete;
-  TargetDataX8664(const TargetDataX8664 &) = delete;
-  TargetDataX8664 &operator=(const TargetDataX8664 &) = delete;
-
-public:
-  ~TargetDataX8664() override = default;
-
-  static std::unique_ptr<TargetDataLowering> create(GlobalContext *Ctx) {
-    return makeUnique<TargetDataX8664>(Ctx);
-  }
-
-  void lowerGlobals(const VariableDeclarationList &Vars,
-                    const IceString &SectionSuffix) override;
-
-  void lowerConstants() override;
-  void lowerJumpTables() override;
-
-private:
-  ENABLE_MAKE_UNIQUE;
-
-  explicit TargetDataX8664(GlobalContext *Ctx) : TargetDataLowering(Ctx) {}
-  template <typename T> static void emitConstantPool(GlobalContext *Ctx);
-};
-
-class TargetHeaderX8664 : public TargetHeaderLowering {
-  TargetHeaderX8664() = delete;
-  TargetHeaderX8664(const TargetHeaderX8664 &) = delete;
-  TargetHeaderX8664 &operator=(const TargetHeaderX8664 &) = delete;
-
-public:
-  ~TargetHeaderX8664() = default;
-
-  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 X8664
 } // end of namespace Ice