AVRMCExpr: Migrate to MCSpecifierExpr

Author: MaskRay

llvm/lib/Target/AVR/MCTargetDesc/AVRMCCodeEmitter.cpp

@@ -230,7 +230,7 @@ unsigned AVRMCCodeEmitter::getExprOpValue(const MCExpr *Expr,
     Kind = Expr->getKind();
   }
 
-  if (Kind == MCExpr::Target) {
+  if (Kind == MCExpr::Specifier) {
     AVRMCExpr const *AVRExpr = cast<AVRMCExpr>(Expr);
     int64_t Result;
     if (AVRExpr->evaluateAsConstant(Result)) {

llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.cpp

@@ -69,8 +69,7 @@ bool AVRMCExpr::evaluateAsConstant(int64_t &Result) const {
 bool AVRMCExpr::evaluateAsRelocatableImpl(MCValue &Result,
                                           const MCAssembler *Asm) const {
   MCValue Value;
-  bool isRelocatable = SubExpr->evaluateAsRelocatable(Value, Asm);
-
+  bool isRelocatable = getSubExpr()->evaluateAsRelocatable(Value, Asm);
   if (!isRelocatable)
     return false;
 
@@ -187,10 +186,6 @@ AVR::Fixups AVRMCExpr::getFixupKind() const {
   return Kind;
 }
 
-void AVRMCExpr::visitUsedExpr(MCStreamer &Streamer) const {
-  Streamer.visitUsedExpr(*getSubExpr());
-}
-
 const char *AVRMCExpr::getName() const {
   const auto &Modifier =
       llvm::find_if(ModifierNames, [this](ModifierEntry const &Mod) {

llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.h

@@ -16,10 +16,11 @@
 namespace llvm {
 
 /// A expression in AVR machine code.
-class AVRMCExpr : public MCTargetExpr {
+class AVRMCExpr : public MCSpecifierExpr {
 public:
+  using Specifier = Spec;
   /// Specifies the type of an expression.
-  enum Specifier {
+  enum {
     VK_None,
 
     VK_AVR_NONE = MCSymbolRefExpr::FirstTargetSpecifier,
@@ -48,11 +49,8 @@ class AVRMCExpr : public MCTargetExpr {
   static const AVRMCExpr *create(Specifier S, const MCExpr *Expr,
                                  bool isNegated, MCContext &Ctx);
 
-  /// Gets the type of the expression.
-  Specifier getSpecifier() const { return specifier; }
   /// Gets the name of the expression.
   const char *getName() const;
-  const MCExpr *getSubExpr() const { return SubExpr; }
   /// Gets the fixup which corresponds to the expression.
   AVR::Fixups getFixupKind() const;
   /// Evaluates the fixup as a constant value.
@@ -64,30 +62,18 @@ class AVRMCExpr : public MCTargetExpr {
   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 bool classof(const MCExpr *E) {
-    return E->getKind() == MCExpr::Target;
-  }
 
 public:
   static Specifier parseSpecifier(StringRef Name);
 
 private:
   int64_t evaluateAsInt64(int64_t Value) const;
 
-  const Specifier specifier;
-  const MCExpr *SubExpr;
   bool Negated;
 
 private:
   explicit AVRMCExpr(Specifier S, const MCExpr *Expr, bool Negated)
-      : specifier(S), SubExpr(Expr), Negated(Negated) {}
-  ~AVRMCExpr() = default;
+      : MCSpecifierExpr(Expr, S), Negated(Negated) {}
 };
 
 } // end namespace llvm