[llvm] ff2ed15 - [MC] evaluateAsAbsolute requires MCValue::RefKind==0

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2025-03-15T15:33:09-07:00
New Revision: ff2ed154a8a9ea52adb3667833fe6fddd27b0487

URL: https://github.com/llvm/llvm-project/commit/ff2ed154a8a9ea52adb3667833fe6fddd27b0487
DIFF: https://github.com/llvm/llvm-project/commit/ff2ed154a8a9ea52adb3667833fe6fddd27b0487.diff

LOG: [MC] evaluateAsAbsolute requires MCValue::RefKind==0

In `.equ a, 3; .if a at plt`, a at plt does not evaluate to an absolute value
(MCExpr::evaluateAsRelocatableImpl disables evaluation when the Kind !=
0 at parse time). Similarly, when using MCTargetValue,
evaluateAsAbsolute should return false when MCValue::RefKind==0.

This allows us to remove `if (!Asm)` check from MipsMCExpr.cpp
(%hi(0xdeadbeef) is not evaluated to a constant without RefKind) and
make targets less error-prone.

Added: 
    

Modified: 
    llvm/lib/MC/MCExpr.cpp
    llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index a4dba8eb46243..999b968e70100 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/lib/MC/MCExpr.cpp
@@ -286,11 +286,11 @@ bool MCExpr::evaluateAsAbsolute(int64_t &Res, const MCAssembler *Asm,
   }
 
   bool IsRelocatable = evaluateAsRelocatableImpl(Value, Asm, Addrs, InSet);
-
-  // Record the current value.
   Res = Value.getConstant();
-
-  return IsRelocatable && Value.isAbsolute();
+  // Value with RefKind (e.g. %hi(0xdeadbeef) in MIPS) is not considered
+  // absolute (the value is unknown at parse time), even if it might be resolved
+  // by evaluateFixup.
+  return IsRelocatable && Value.isAbsolute() && Value.getRefKind() == 0;
 }
 
 /// Helper method for \see EvaluateSymbolAdd().

diff  --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
index 2bbacc5f84041..89a151cb2f131 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
@@ -131,8 +131,6 @@ void MipsMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
 
 bool MipsMCExpr::evaluateAsRelocatableImpl(MCValue &Res, const MCAssembler *Asm,
                                            const MCFixup *Fixup) const {
-  if (!Asm)
-    return false;
   // Look for the %hi(%neg(%gp_rel(X))) and %lo(%neg(%gp_rel(X))) special cases.
   if (isGpOff()) {
     const MCExpr *SubExpr =