XtensaMCExpr: Migrate to MCSpecifierExpr

Author: MaskRay

llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCExpr.cpp

@@ -40,18 +40,6 @@ void XtensaMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
     OS << ')';
 }
 
-bool XtensaMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
-                                             const MCAssembler *Asm) const {
-  if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
-    return false;
-  Res.setSpecifier(specifier);
-  return !Res.getSubSym();
-}
-
-void XtensaMCExpr::visitUsedExpr(MCStreamer &Streamer) const {
-  Streamer.visitUsedExpr(*getSubExpr());
-}
-
 XtensaMCExpr::Specifier XtensaMCExpr::parseSpecifier(StringRef name) {
   return StringSwitch<XtensaMCExpr::Specifier>(name).Default(VK_None);
 }

llvm/lib/Target/Xtensa/MCTargetDesc/XtensaMCExpr.h

@@ -20,32 +20,20 @@
 namespace llvm {
 
 class StringRef;
-class XtensaMCExpr : public MCTargetExpr {
+class XtensaMCExpr : public MCSpecifierExpr {
 public:
-  enum Specifier { VK_None, VK_TPOFF };
+  using Specifier = uint16_t;
+  enum { VK_None, VK_TPOFF };
 
 private:
-  const MCExpr *Expr;
-  const Specifier specifier;
-
   explicit XtensaMCExpr(const MCExpr *Expr, Specifier S)
-      : Expr(Expr), specifier(S) {}
+      : MCSpecifierExpr(Expr, S) {}
 
 public:
   static const XtensaMCExpr *create(const MCExpr *Expr, Specifier,
                                     MCContext &Ctx);
 
-  Specifier getSpecifier() const { return specifier; }
-
-  const MCExpr *getSubExpr() const { return Expr; }
-
   void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override;
-  bool evaluateAsRelocatableImpl(MCValue &Res,
-                                 const MCAssembler *Asm) const override;
-  void visitUsedExpr(MCStreamer &Streamer) const override;
-  MCFragment *findAssociatedFragment() const override {
-    return getSubExpr()->findAssociatedFragment();
-  }
 
   static Specifier parseSpecifier(StringRef name);
   static StringRef getSpecifierName(Specifier Kind);