[cling] Move static init function renaming to BackendPasses.cpp

interpreter/cling/lib/Interpreter/BackendPasses.cpp

@@ -40,6 +40,48 @@ using namespace cling;
 using namespace clang;
 using namespace llvm;
 
+namespace {
+  class UniqueInitFunctionNamePass
+      : public PassInfoMixin<UniqueInitFunctionNamePass> {
+    // append a suffix to a symbol to make it unique
+    // the suffix is "_cling_module_<module number>"
+    llvm::SmallString<128> add_module_suffix(const StringRef OriginalName,
+                                             const StringRef ModuleName) {
+      llvm::SmallString<128> NewFunctionName;
+      NewFunctionName.append(ModuleName);
+      NewFunctionName.append("_");
+
+      for (size_t i = 0; i < NewFunctionName.size(); ++i) {
+        // Replace everything that is not [a-zA-Z0-9._] with a _. This set
+        // happens to be the set of C preprocessing numbers.
+        if (!isPreprocessingNumberBody(NewFunctionName[i]))
+          NewFunctionName[i] = '_';
+      }
+
+      return NewFunctionName;
+    }
+
+    // make static initialization function names (__cxx_global_var_init) unique
+    bool runOnFunction(Function& F, const StringRef ModuleName) {
+      if (F.hasName() && F.getName().starts_with("__cxx_global_var_init")) {
+        F.setName(add_module_suffix(F.getName(), ModuleName));
+        return true;
+      }
+
+      return false;
+    }
+
+  public:
+    PreservedAnalyses run(llvm::Module& M, ModuleAnalysisManager& AM) {
+      bool changed = false;
+      const StringRef ModuleName = M.getName();
+      for (auto&& F : M)
+        changed |= runOnFunction(F, ModuleName);
+      return changed ? PreservedAnalyses::none() : PreservedAnalyses::all();
+    }
+  };
+} // namespace
+
 namespace {
   class WorkAroundConstructorPriorityBugPass
       : public PassInfoMixin<WorkAroundConstructorPriorityBugPass> {
@@ -421,6 +463,7 @@ void BackendPasses::CreatePasses(int OptLevel, llvm::ModulePassManager& MPM,
 
   // TODO: Remove this pass once we upgrade past LLVM 19 that includes the fix.
   MPM.addPass(WorkAroundConstructorPriorityBugPass());
+  MPM.addPass(UniqueInitFunctionNamePass());
   MPM.addPass(KeepLocalGVPass());
   MPM.addPass(WeakTypeinfoVTablePass());
   MPM.addPass(ReuseExistingWeakSymbols(m_JIT));

interpreter/llvm-project/clang/lib/CodeGen/CGDeclCXX.cpp

@@ -540,19 +540,9 @@ CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D,
     getCXXABI().getMangleContext().mangleDynamicInitializer(D, Out);
   }
 
-  // Use the module name to make the initializer unique accross modules.
-  SmallString<128> moduleName(TheModule.getName());
-  for (size_t i = 0; i < moduleName.size(); ++i) {
-    // Replace everything that's not [a-zA-Z0-9._] with a _. This set happens
-    // to be the set of C preprocessing numbers.
-    if (!isPreprocessingNumberBody(moduleName[i]))
-      moduleName[i] = '_';
-  }
-
   // Create a variable initialization function.
   llvm::Function *Fn = CreateGlobalInitOrCleanUpFunction(
-      FTy, llvm::Twine(FnName)+moduleName.str() + "_",
-      getTypes().arrangeNullaryFunction(), D->getLocation());
+      FTy, FnName.str(), getTypes().arrangeNullaryFunction(), D->getLocation());
 
   auto *ISA = D->getAttr<InitSegAttr>();
   CodeGenFunction(*this).GenerateCXXGlobalVarDeclInitFunc(Fn, D, Addr,

interpreter/llvm-project/llvm-project.tag

@@ -1 +1 @@
-ROOT-llvm18-20250113-01
+ROOT-llvm18-20250117-01