commit cadfaa83ff1f7d9f983b23a756f25884a3d6314c
author Fangrui Song <i@maskray.me> Sat Apr 05 11:45:52 2025 -0700
committer Fangrui Song <i@maskray.me> Sat Apr 05 11:45:53 2025 -0700
tree a0fd9833d53212233b6ddbbc96759f50ef0c35d9
parent 33246f79e87a0e629ae776d1811a1175a3f10065

[AVR,CSKY] Migrate away from MCValue::getSymB

The MCValue::SymB MCSymbolRefExpr member might be replaced with a
MCSymbol in the future. Reduce direct access.

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

diff --git a/llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.cpp b/llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.cpp
index e187a82..b6d71f2 100644
--- a/llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.cpp
+++ b/llvm/lib/Target/AVR/MCTargetDesc/AVRMCExpr.cpp
@@ -85,12 +85,13 @@
     MCSymbolRefExpr::VariantKind Modifier = Sym->getKind();
     if (Modifier != MCSymbolRefExpr::VK_None)
       return false;
+    assert(!Value.getSubSym());
     if (specifier == VK_PM) {
       Modifier = MCSymbolRefExpr::VariantKind(AVRMCExpr::VK_PM);
     }
 
     Sym = MCSymbolRefExpr::create(&Sym->getSymbol(), Modifier, Context);
-    Result = MCValue::get(Sym, Value.getSymB(), Value.getConstant());
+    Result = MCValue::get(Sym, nullptr, Value.getConstant());
   }
 
   return true;

llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp

diff --git a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp
index 338ac63..696cd1d 100644
--- a/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp
+++ b/llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp
@@ -72,5 +72,5 @@
   if (!getSubExpr()->evaluateAsRelocatable(Res, Asm))
     return false;
   Res.setSpecifier(specifier);
-  return !Res.getSymB();
+  return !Res.getSubSym();
 }