[lld] [llvm] [MC] Explicitly mark MCSymbol for MO_ExternalSymbol (PR #108880)

[weiwei chen via llvm-commits]

https://github.com/weiweichen updated https://github.com/llvm/llvm-project/pull/108880

>From 8bf3c85978b774c0606e5d1be7cbd3415f036259 Mon Sep 17 00:00:00 2001
From: Weiwei Chen <weiwei.chen at modular.com>
Date: Mon, 16 Sep 2024 20:37:30 +0000
Subject: [PATCH 1/4] Explicitly mark MCSymbol for MO_ExternalSymbol

---
 llvm/lib/Target/X86/X86MCInstLower.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/Target/X86/X86MCInstLower.cpp b/llvm/lib/Target/X86/X86MCInstLower.cpp
index 77ddd2366e629e..949711f35aa584 100644
--- a/llvm/lib/Target/X86/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/X86MCInstLower.cpp
@@ -350,8 +350,11 @@ 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:

>From f353d11fd2417f9e65fa5efbbfea6c6196b5d30e Mon Sep 17 00:00:00 2001
From: Weiwei Chen <weiwei.chen at modular.com>
Date: Tue, 17 Sep 2024 03:50:22 +0000
Subject: [PATCH 2/4] Fix load-hidden.ll

---
 lld/test/MachO/load-hidden.ll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lld/test/MachO/load-hidden.ll b/lld/test/MachO/load-hidden.ll
index 110b96ae5cf5a6..1e92acce18d110 100644
--- a/lld/test/MachO/load-hidden.ll
+++ b/lld/test/MachO/load-hidden.ll
@@ -6,7 +6,7 @@
 
 ; RUN: %lld -dylib -lSystem %t/obj.o -load_hidden %t/archive.a -o %t/test.dylib
 ; RUN: llvm-nm %t/test.dylib | FileCheck %s
-; CHECK: t _foo
+; CHECK: T _foo
 
 ;--- archive.ll
 target triple = "x86_64-apple-macosx10.15.0"

>From 0c5f976fdb05355a782f453b1b9f2316762861f9 Mon Sep 17 00:00:00 2001
From: Weiwei Chen <weiwei.chen at modular.com>
Date: Tue, 17 Sep 2024 21:20:44 -0400
Subject: [PATCH 3/4] Fix silly goof because I cannot read switch code.

---
 llvm/lib/Target/X86/X86MCInstLower.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/llvm/lib/Target/X86/X86MCInstLower.cpp b/llvm/lib/Target/X86/X86MCInstLower.cpp
index 949711f35aa584..5c8dc16ff31da4 100644
--- a/llvm/lib/Target/X86/X86MCInstLower.cpp
+++ b/llvm/lib/Target/X86/X86MCInstLower.cpp
@@ -350,6 +350,7 @@ MCOperand X86MCInstLower::LowerMachineOperand(const MachineInstr *MI,
     return MCOperand::createImm(MO.getImm());
   case MachineOperand::MO_MachineBasicBlock:
   case MachineOperand::MO_GlobalAddress:
+    return LowerSymbolOperand(MO, GetSymbolFromOperand(MO));
   case MachineOperand::MO_ExternalSymbol: {
     MCSymbol *Sym = GetSymbolFromOperand(MO);
     Sym->setExternal(true);

>From 741c735fd874298ee1c8e5b412d47f4c28293860 Mon Sep 17 00:00:00 2001
From: Weiwei Chen <weiwei.chen at modular.com>
Date: Tue, 17 Sep 2024 23:43:59 -0400
Subject: [PATCH 4/4] Revert test change in load-hidden.ll.

---
 lld/test/MachO/load-hidden.ll | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lld/test/MachO/load-hidden.ll b/lld/test/MachO/load-hidden.ll
index 1e92acce18d110..110b96ae5cf5a6 100644
--- a/lld/test/MachO/load-hidden.ll
+++ b/lld/test/MachO/load-hidden.ll
@@ -6,7 +6,7 @@
 
 ; RUN: %lld -dylib -lSystem %t/obj.o -load_hidden %t/archive.a -o %t/test.dylib
 ; RUN: llvm-nm %t/test.dylib | FileCheck %s
-; CHECK: T _foo
+; CHECK: t _foo
 
 ;--- archive.ll
 target triple = "x86_64-apple-macosx10.15.0"