[RelLookupTableConverter] Drop unnamed_addr for GVs in operands to avoid generating GOTPCREL relocations (Style 2)

Author: dianqk

llvm/lib/Transforms/Utils/RelLookupTableConverter.cpp

@@ -21,10 +21,7 @@
 
 using namespace llvm;
 
-static bool
-shouldConvertToRelLookupTable(Module &M, GlobalVariable &GV,
-                              SmallVectorImpl<GlobalVariable *> &GVOps,
-                              bool ShouldDropUnnamedAddr) {
+static bool shouldConvertToRelLookupTable(Module &M, GlobalVariable &GV) {
   // If lookup table has more than one user,
   // do not generate a relative lookup table.
   // This is to simplify the analysis that needs to be done for this pass.
@@ -69,6 +66,20 @@ shouldConvertToRelLookupTable(Module &M, GlobalVariable &GV,
   if (!ElemType->isPointerTy() || DL.getPointerTypeSizeInBits(ElemType) != 64)
     return false;
 
+  SmallVector<GlobalVariable *, 4> GVOps;
+  Triple TT = M.getTargetTriple();
+  // FIXME: This should be removed in the future.
+  bool ShouldDropUnnamedAddr =
+      // Drop unnamed_addr to avoid matching pattern in
+      // `handleIndirectSymViaGOTPCRel`, which generates GOTPCREL relocations
+      // not supported by the GNU linker and LLD versions below 18 on aarch64.
+      TT.isAArch64()
+      // Apple's ld64 (and ld-prime on Xcode 15.2) miscompile something on
+      // x86_64-apple-darwin. See
+      // https://github.com/rust-lang/rust/issues/140686 and
+      // https://github.com/rust-lang/rust/issues/141306.
+      || (TT.isX86() && TT.isOSDarwin());
+
   for (const Use &Op : Array->operands()) {
     Constant *ConstOp = cast<Constant>(&Op);
     GlobalValue *GVOp;
@@ -93,6 +104,10 @@ shouldConvertToRelLookupTable(Module &M, GlobalVariable &GV,
       GVOps.push_back(GlovalVarOp);
   }
 
+  if (ShouldDropUnnamedAddr)
+    for (auto *GVOp : GVOps)
+      GVOp->setUnnamedAddr(GlobalValue::UnnamedAddr::None);
+
   return true;
 }
 
@@ -189,28 +204,10 @@ static bool convertToRelativeLookupTables(
 
   bool Changed = false;
 
-  Triple TT = M.getTargetTriple();
-  // FIXME: This should be removed in the future.
-  bool ShouldDropUnnamedAddr =
-      // Drop unnamed_addr to avoid matching pattern in
-      // `handleIndirectSymViaGOTPCRel`, which generates GOTPCREL relocations
-      // not supported by the GNU linker and LLD versions below 18 on aarch64.
-      TT.isAArch64()
-      // Apple's ld64 (and ld-prime on Xcode 15.2) miscompile something on
-      // x86_64-apple-darwin. See
-      // https://github.com/rust-lang/rust/issues/140686 and
-      // https://github.com/rust-lang/rust/issues/141306.
-      || (TT.isX86() && TT.isOSDarwin());
   for (GlobalVariable &GV : llvm::make_early_inc_range(M.globals())) {
-    SmallVector<GlobalVariable *, 4> GVOps;
-
-    if (!shouldConvertToRelLookupTable(M, GV, GVOps, ShouldDropUnnamedAddr))
+    if (!shouldConvertToRelLookupTable(M, GV))
       continue;
 
-    if (ShouldDropUnnamedAddr)
-      for (auto *GVOp : GVOps)
-        GVOp->setUnnamedAddr(GlobalValue::UnnamedAddr::None);
-
     convertToRelLookupTable(GV);
 
     // Remove the original lookup table.