[llvm] 1b043c2 - [RISCV] Simplify RISCVMCExpr::evaluateAsConstant

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2025-03-02T22:44:01-08:00
New Revision: 1b043c25573aa0b13ad4241c641c38ca26f26bc1

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

LOG: [RISCV] Simplify RISCVMCExpr::evaluateAsConstant

Most VariantKind cannot be evaluated at the parsing time.
It makes more sense to list the evaluable cases.

Added: 
    

Modified: 
    llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
index 16d0796b6013f..4f56e3cbfe1b9 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVMCExpr.cpp
@@ -214,14 +214,7 @@ void RISCVMCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const {
 
 bool RISCVMCExpr::evaluateAsConstant(int64_t &Res) const {
   MCValue Value;
-
-  if (Kind == VK_RISCV_PCREL_HI || Kind == VK_RISCV_PCREL_LO ||
-      Kind == VK_RISCV_GOT_HI || Kind == VK_RISCV_TPREL_HI ||
-      Kind == VK_RISCV_TPREL_LO || Kind == VK_RISCV_TPREL_ADD ||
-      Kind == VK_RISCV_TLS_GOT_HI || Kind == VK_RISCV_TLS_GD_HI ||
-      Kind == VK_RISCV_TLSDESC_HI || Kind == VK_RISCV_TLSDESC_LOAD_LO ||
-      Kind == VK_RISCV_TLSDESC_ADD_LO || Kind == VK_RISCV_TLSDESC_CALL ||
-      Kind == VK_RISCV_CALL || Kind == VK_RISCV_CALL_PLT)
+  if (Kind != VK_RISCV_LO && Kind != VK_RISCV_HI)
     return false;
 
   if (!getSubExpr()->evaluateAsRelocatable(Value, nullptr, nullptr))