[llvm-branch-commits] [llvm] release/20.x: Revert "[MC] Explicitly mark MCSymbol for MO_ExternalSymbol" (#133291) (PR #133348)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Thu Mar 27 17:53:17 PDT 2025


https://github.com/llvmbot created https://github.com/llvm/llvm-project/pull/133348

Backport cd6e959102888279dc7e75a41ebd75a08ac3f7a5

Requested by: @efriedma-quic

>From 2406e0d4467a265678f4e414f23a88faf5012944 Mon Sep 17 00:00:00 2001
From: Eli Friedman <efriedma at quicinc.com>
Date: Thu, 27 Mar 2025 17:46:42 -0700
Subject: [PATCH] Revert "[MC] Explicitly mark MCSymbol for MO_ExternalSymbol"
 (#133291)

Reverts llvm/llvm-project#108880 .

The patch has no regression test, no description of why the fix is
necessary, and the code is modifying MC datastructures in a way that's
forbidden in the AsmPrinter.

Fixes #132055.

(cherry picked from commit cd6e959102888279dc7e75a41ebd75a08ac3f7a5)
---
 llvm/lib/Target/X86/X86MCInstLower.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/llvm/lib/Target/X86/X86MCInstLower.cpp b/llvm/lib/Target/X86/X86MCInstLower.cpp
index 645a9baeba65c..680bf4286da0c 100644
--- a/llvm/lib/Target/X86/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/X86MCInstLower.cpp
@@ -348,12 +348,8 @@ MCOperand X86MCInstLower::LowerMachineOperand(const MachineInstr *MI,
     return MCOperand::createImm(MO.getImm());
   case MachineOperand::MO_MachineBasicBlock:
   case MachineOperand::MO_GlobalAddress:
+  case MachineOperand::MO_ExternalSymbol:
     return LowerSymbolOperand(MO, GetSymbolFromOperand(MO));
-  case MachineOperand::MO_ExternalSymbol: {
-    MCSymbol *Sym = GetSymbolFromOperand(MO);
-    Sym->setExternal(true);
-    return LowerSymbolOperand(MO, Sym);
-  }
   case MachineOperand::MO_MCSymbol:
     return LowerSymbolOperand(MO, MO.getMCSymbol());
   case MachineOperand::MO_JumpTableIndex:



More information about the llvm-branch-commits mailing list