[llvm] 79d84a8 - MipsMCExpr: remove unneeded folding and fix a crash for %hi(und-$L3)

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2025-03-15T14:31:10-07:00
New Revision: 79d84a878e83990c235da8710273a98bf835c915

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

LOG: MipsMCExpr: remove unneeded folding and fix a crash for %hi(und-$L3)

After folding the inner expression, we might get something like
%hi(0x30124), MipsAsmBackend::applyFixup will apply the relocation
operator, so we don't need to duplicate code in MipsMCExpr
(introduced by https://reviews.llvm.org/D19716).

While we don't know the encoding at parse time (see hilo-addressing.s),
it is not an issue.

This change also removes an inappropriate use of `Fixup`
(introduced in 2014 by 752b91bd821ad8a23e004b6cd631ae4f6984ae8b ; which
will go away with my next change).

In addition, fix a crash by porting the fix from RISCV.
```
lui $4, %hi(und-$L3)
```

Added: 
    

Modified: 
    llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
    llvm/test/MC/Mips/hilo-addressing.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
index 496421c88396c..2bbacc5f84041 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
@@ -131,6 +131,8 @@ 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 =
@@ -146,73 +148,9 @@ bool MipsMCExpr::evaluateAsRelocatableImpl(MCValue &Res, const MCAssembler *Asm,
 
   if (!getSubExpr()->evaluateAsRelocatable(Res, Asm, Fixup))
     return false;
-
-  if (Res.getRefKind() != MCSymbolRefExpr::VK_None)
-    return false;
-
-  // evaluateAsAbsolute() and evaluateAsValue() require that we evaluate the
-  // %hi/%lo/etc. here. Fixup is a null pointer when either of these is the
-  // caller.
-  if (Res.isAbsolute() && Fixup == nullptr) {
-    int64_t AbsVal = Res.getConstant();
-    switch (Kind) {
-    case MEK_None:
-    case MEK_Special:
-      llvm_unreachable("MEK_None and MEK_Special are invalid");
-    case MEK_DTPREL:
-      // MEK_DTPREL is used for marking TLS DIEExpr only
-      // and contains a regular sub-expression.
-      return getSubExpr()->evaluateAsRelocatable(Res, Asm, Fixup);
-    case MEK_DTPREL_HI:
-    case MEK_DTPREL_LO:
-    case MEK_GOT:
-    case MEK_GOTTPREL:
-    case MEK_GOT_CALL:
-    case MEK_GOT_DISP:
-    case MEK_GOT_HI16:
-    case MEK_GOT_LO16:
-    case MEK_GOT_OFST:
-    case MEK_GOT_PAGE:
-    case MEK_GPREL:
-    case MEK_PCREL_HI16:
-    case MEK_PCREL_LO16:
-    case MEK_TLSGD:
-    case MEK_TLSLDM:
-    case MEK_TPREL_HI:
-    case MEK_TPREL_LO:
-      return false;
-    case MEK_LO:
-    case MEK_CALL_LO16:
-      AbsVal = SignExtend64<16>(AbsVal);
-      break;
-    case MEK_CALL_HI16:
-    case MEK_HI:
-      AbsVal = SignExtend64<16>((AbsVal + 0x8000) >> 16);
-      break;
-    case MEK_HIGHER:
-      AbsVal = SignExtend64<16>((AbsVal + 0x80008000LL) >> 32);
-      break;
-    case MEK_HIGHEST:
-      AbsVal = SignExtend64<16>((AbsVal + 0x800080008000LL) >> 48);
-      break;
-    case MEK_NEG:
-      AbsVal = -AbsVal;
-      break;
-    }
-    Res = MCValue::get(AbsVal);
-    return true;
-  }
-
-  // We want to defer it for relocatable expressions since the constant is
-  // applied to the whole symbol value.
-  //
-  // The value of getKind() that is given to MCValue is only intended to aid
-  // debugging when inspecting MCValue objects. It shouldn't be relied upon
-  // for decision making.
   Res =
       MCValue::get(Res.getSymA(), Res.getSymB(), Res.getConstant(), getKind());
-
-  return true;
+  return !Res.getSymB();
 }
 
 void MipsMCExpr::visitUsedExpr(MCStreamer &Streamer) const {

diff  --git a/llvm/test/MC/Mips/hilo-addressing.s b/llvm/test/MC/Mips/hilo-addressing.s
index 3c04fbad6b51d..b425bf5ab1b7c 100644
--- a/llvm/test/MC/Mips/hilo-addressing.s
+++ b/llvm/test/MC/Mips/hilo-addressing.s
@@ -7,14 +7,15 @@
 # RUN: llvm-mc -filetype=obj -triple=mipsel-unknown-linux %s \
 # RUN:  | llvm-readobj -r - | FileCheck %s -check-prefix=CHECK-REL
 
+# RUN: not llvm-mc -filetype=obj -triple=mipsel %s --defsym ERR=1 2>&1 | FileCheck %s --check-prefix=ERR --implicit-check-not=error:
 
 # Check that 1 is added to the high 16 bits if bit 15 of the low part is 1.
 
         .equ    addr, 0xdeadbeef
         lui     $4, %hi(addr)
         lb      $2, %lo(addr)($4)
-# CHECK-ENC: # encoding: [0x3c,0x04,0xde,0xae]
-# CHECK-ENC: # encoding: [0x80,0x82,0xbe,0xef]
+# CHECK-ENC: # encoding: [0x3c,0x04,A,A]
+# CHECK-ENC: # encoding: [0x80,0x82,A,A]
 
 
 # Check that assembler can handle %hi(label1 - label2) and %lo(label1 - label2)
@@ -40,3 +41,8 @@ $L3:
 # %lo(label1 - label2) expressions.
 
 # CHECK-REL-NOT:    R_MIPS
+
+.ifdef ERR
+# ERR: <unknown>:0: error: expected relocatable expression
+lui $4, %hi(und-$L3)
+.endif