[llvm-branch-commits] [llvm] [ThinLTO] Use .llvm. prefix when promoting split-LTO internals (PR #240699)

Vitaly Buka via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Mon Nov 9 20:17:07 PST 2026


https://github.com/vitalybuka created https://github.com/llvm/llvm-project/pull/240699

Under `-fsplit-lto-unit` (enabled by CFI), internal-linkage functions and
globals promoted across split ThinLTO/RegularLTO boundaries received a
bare `.<md5>` module suffix without `.llvm.`, preventing SamplePGO,
InstrProfSymtab, FunctionImport, and MemProf canonicalization from
stripping the promotion suffix.

CC: @benschlueter
Co-authored-by: Benedict Schlüter <bschlueter at google.com>
Assisted-by: Gemini

>From a79a1ebb6762c845a1cee9e84e9739dba11e5890 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalybuka at google.com>
Date: Mon, 9 Nov 2026 20:16:55 -0800
Subject: [PATCH] [spr] update

Created using spr 2.0.0-beta.2
---
 .../Transforms/IPO/ThinLTOBitcodeWriter.cpp   |  11 +-
 llvm/test/ThinLTO/X86/cfi-icall-thinlto.ll    |   8 +-
 .../X86/cfi-import-internal-coroutine.ll      |   8 +-
 .../X86/cfi-split-lto-sample-profile.ll       | 111 ++++++++++++++++++
 llvm/test/ThinLTO/X86/devirt2.ll              |   8 +-
 .../cfi-icall-static-inline-asm.ll            |   4 +-
 .../cfi-relative-vtable.ll                    |  12 +-
 .../cfi_dso_local_equivalent.ll               |  12 +-
 .../split-internal-alias.ll                   |  12 +-
 .../ThinLTOBitcodeWriter/split-internal1.ll   |   6 +-
 .../ThinLTOBitcodeWriter/split-internal2.ll   |  12 +-
 .../split-vfunc-internal.ll                   |  10 +-
 .../unique-source-file-names.ll               |   2 +-
 .../temporary-files-as-bitcode-split.ll       |   2 +-
 llvm/tools/llvm-lto2/llvm-lto2.cpp            |  17 ++-
 15 files changed, 180 insertions(+), 55 deletions(-)
 create mode 100644 llvm/test/ThinLTO/X86/cfi-split-lto-sample-profile.ll

diff --git a/llvm/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp b/llvm/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp
index 23091f3ed95355..689b791308f9dc 100644
--- a/llvm/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp
+++ b/llvm/lib/Transforms/IPO/ThinLTOBitcodeWriter.cpp
@@ -17,6 +17,7 @@
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/Module.h"
+#include "llvm/IR/ModuleSummaryIndex.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Transforms/IPO.h"
@@ -30,9 +31,14 @@ using namespace llvm;
 namespace {
 
 // Promote each local-linkage entity defined by ExportM and used by ImportM by
-// changing visibility and appending the given ModuleId.
+// changing visibility and appending ".llvm" + ModuleId (matching
+// ModuleSummaryIndex::getGlobalNameForLocal so downstream PGO, SamplePGO,
+// MemProf, and linker symbol canonicalization strip the promotion suffix).
 void promoteInternals(Module &ExportM, Module &ImportM, StringRef ModuleId,
                       SetVector<GlobalValue *> *PromoteExtra = nullptr) {
+  assert(ModuleId.starts_with(".") &&
+         "Expected getUniqueModuleId to return a leading dot");
+  StringRef ModuleHashStr = ModuleId.drop_front();
   DenseMap<const Comdat *, Comdat *> RenamedComdats;
   for (auto &ExportGV : ExportM.global_values()) {
     if (!ExportGV.hasLocalLinkage())
@@ -52,7 +58,8 @@ void promoteInternals(Module &ExportM, Module &ImportM, StringRef ModuleId,
       }
     }
 
-    std::string NewName = (Name + ModuleId).str();
+    std::string NewName =
+        ModuleSummaryIndex::getGlobalNameForLocal(Name, ModuleHashStr);
 
     if (const auto *C = ExportGV.getComdat())
       if (C->getName() == Name)
diff --git a/llvm/test/ThinLTO/X86/cfi-icall-thinlto.ll b/llvm/test/ThinLTO/X86/cfi-icall-thinlto.ll
index a497effd934e3c..7aa71f244559d6 100644
--- a/llvm/test/ThinLTO/X86/cfi-icall-thinlto.ll
+++ b/llvm/test/ThinLTO/X86/cfi-icall-thinlto.ll
@@ -6,7 +6,7 @@
 ; RUN: llvm-lto2 run -save-temps %t.dir/lib.bc %t.dir/main.bc -o %t.dir/summary \
 ; RUN:   -r=%t.dir/lib.bc,_Z11public_funcv,plx \
 ; RUN:   -r=%t.dir/lib.bc,syscall, \
-; RUN:   -r=%t.dir/lib.bc,_ZN12_GLOBAL__N_113internal_funcEv.35df87b54cddf81e734207bfc5eea57a,pl \
+; RUN:   -r=%t.dir/lib.bc,_ZN12_GLOBAL__N_113internal_funcEv.llvm.35df87b54cddf81e734207bfc5eea57a,pl \
 ; RUN:   -r=%t.dir/main.bc,main,plx \
 ; RUN:   -r=%t.dir/main.bc,_Z11public_funcv,l
 ; RUN: llvm-dis %t.dir/summary.2.4.opt.bc -o - | FileCheck %s
@@ -15,7 +15,7 @@
 ; RUN:   -o %t.dir/distidx \
 ; RUN:   -r=%t.dir/lib.bc,_Z11public_funcv,plx \
 ; RUN:   -r=%t.dir/lib.bc,syscall, \
-; RUN:   -r=%t.dir/lib.bc,_ZN12_GLOBAL__N_113internal_funcEv.35df87b54cddf81e734207bfc5eea57a,pl \
+; RUN:   -r=%t.dir/lib.bc,_ZN12_GLOBAL__N_113internal_funcEv.llvm.35df87b54cddf81e734207bfc5eea57a,pl \
 ; RUN:   -r=%t.dir/main.bc,main,plx \
 ; RUN:   -r=%t.dir/main.bc,_Z11public_funcv,l
 ; RUN: llvm-bcanalyzer -dump %t.dir/lib.bc.thinlto.bc | FileCheck %s --check-prefix=DIST
@@ -32,9 +32,9 @@
 ; Verify that the distributed index records CFI_FUNCTION_DEFS with the
 ; 3-field format [GUID, strtab_offset, name_length]. The promoted internal
 ; function is listed with its stable pre-promotion GUID.
-; DIST:     <CFI_FUNCTION_DEFS op0={{[-0-9]+}} op1=0 op2=67/>
+; DIST:     <CFI_FUNCTION_DEFS op0={{[-0-9]+}} op1=0 op2=72/>
 ; DIST: <STRTAB_BLOCK
-; DIST-NEXT:   <BLOB abbrevid=4/> blob data = '_ZN12_GLOBAL__N_113internal_funcEv.35df87b54cddf81e734207bfc5eea57a_ZTSFjvE'
+; DIST-NEXT:   <BLOB abbrevid=4/> blob data = '_ZN12_GLOBAL__N_113internal_funcEv.llvm.35df87b54cddf81e734207bfc5eea57a_ZTSFjvE'
 
 ;--- lib.ll
 target triple = "x86_64-unknown-linux-gnu"
diff --git a/llvm/test/ThinLTO/X86/cfi-import-internal-coroutine.ll b/llvm/test/ThinLTO/X86/cfi-import-internal-coroutine.ll
index 3fdf6a2a2423c8..e19d800182c8dc 100644
--- a/llvm/test/ThinLTO/X86/cfi-import-internal-coroutine.ll
+++ b/llvm/test/ThinLTO/X86/cfi-import-internal-coroutine.ll
@@ -13,10 +13,10 @@
 ; RUN: opt -thinlto-bc -thinlto-split-lto-unit %t.dir/b.ll -o %t.dir/b.bc
 ; RUN: llvm-lto2 run -save-temps %t.dir/a.bc %t.dir/b.bc -o %t.dir/out \
 ; RUN:   -r=%t.dir/a.bc,get_vtable,plx \
-; RUN:   -r=%t.dir/a.bc,vtable.b66cc3a748330e63b2451fa89522eb06,l \
-; RUN:   -r=%t.dir/a.bc,coro.b66cc3a748330e63b2451fa89522eb06,plx \
-; RUN:   -r=%t.dir/a.bc,vtable.b66cc3a748330e63b2451fa89522eb06,plx \
-; RUN:   -r=%t.dir/a.bc,coro.b66cc3a748330e63b2451fa89522eb06,l \
+; RUN:   -r=%t.dir/a.bc,vtable.llvm.b66cc3a748330e63b2451fa89522eb06,l \
+; RUN:   -r=%t.dir/a.bc,coro.llvm.b66cc3a748330e63b2451fa89522eb06,plx \
+; RUN:   -r=%t.dir/a.bc,vtable.llvm.b66cc3a748330e63b2451fa89522eb06,plx \
+; RUN:   -r=%t.dir/a.bc,coro.llvm.b66cc3a748330e63b2451fa89522eb06,l \
 ; RUN:   -r=%t.dir/b.bc,caller,plx
 ; RUN: llvm-dis %t.dir/out.2.3.import.bc -o - | FileCheck %s --check-prefix=IMPORT
 
diff --git a/llvm/test/ThinLTO/X86/cfi-split-lto-sample-profile.ll b/llvm/test/ThinLTO/X86/cfi-split-lto-sample-profile.ll
new file mode 100644
index 00000000000000..8f96e1fcbaa8c4
--- /dev/null
+++ b/llvm/test/ThinLTO/X86/cfi-split-lto-sample-profile.ll
@@ -0,0 +1,111 @@
+; Verify that internal-linkage CFI functions promoted by ThinLTOBitcodeWriter
+; (-thinlto-split-lto-unit) use the standard ".llvm.<md5>" suffix so that after
+; LowerTypeTests appends ".cfi", SampleProfileLoader canonicalizes the name and
+; matches profiles both when the profile preserves ".__uniq." suffixes
+; (SecFlagUniqSuffix) and when it strips them.
+
+; REQUIRES: x86-registered-target
+
+; RUN: rm -rf %t && split-file %s %t
+; RUN: llvm-profdata merge --sample --extbinary %t/uniq.proftext -o %t/uniq.afdo
+; RUN: llvm-profdata merge --sample --extbinary %t/nouniq.proftext -o %t/nouniq.afdo
+; RUN: opt -thinlto-bc -thinlto-split-lto-unit %t/a.ll -o %t/a.bc
+
+; RUN: llvm-lto2 run -save-temps -lto-sample-profile-file=%t/uniq.afdo \
+; RUN:   %t/a.bc -o %t/out_uniq \
+; RUN:   -r=%t/a.bc,get_callback,plx \
+; RUN:   -r=%t/a.bc,dispatch,plx \
+; RUN:   -r=%t/a.bc,_ZL8callbacki.__uniq.12345,pl \
+; RUN:   -r=%t/a.bc,hot_work, \
+; RUN:   -r=%t/a.bc,cold_work,
+; RUN: llvm-dis %t/out_uniq.1.4.opt.bc -o - | FileCheck %s
+
+; RUN: llvm-lto2 run -save-temps -use-profiled-call-graph=false \
+; RUN:   -lto-sample-profile-file=%t/nouniq.afdo \
+; RUN:   %t/a.bc -o %t/out_nouniq \
+; RUN:   -r=%t/a.bc,get_callback,plx \
+; RUN:   -r=%t/a.bc,dispatch,plx \
+; RUN:   -r=%t/a.bc,_ZL8callbacki.__uniq.12345.llvm.23b776f41b961eec8a36ed5b4c89fcd8,pl \
+; RUN:   -r=%t/a.bc,hot_work, \
+; RUN:   -r=%t/a.bc,cold_work,
+; RUN: llvm-dis %t/out_nouniq.1.4.opt.bc -o - | FileCheck %s
+
+; CHECK: define hidden i32 @_ZL8callbacki.__uniq.12345.llvm.23b776f41b961eec8a36ed5b4c89fcd8.cfi(i32 {{.*}}%x){{.*}} !prof ![[ENTRY:[0-9]+]]
+; CHECK: br i1 {{.*}}, !prof ![[BW:[0-9]+]]
+; CHECK-DAG: ![[ENTRY]] = !{!"function_entry_count", i64 1001}
+; CHECK-DAG: ![[BW]] = !{!"branch_weights", i32 1000, i32 2}
+
+;--- uniq.proftext
+_ZL8callbacki.__uniq.12345:50000:1000
+ 1: 1000
+ 2: 999 hot_work:999
+ 4: 1 cold_work:1
+
+;--- nouniq.proftext
+_ZL8callbacki:50000:1000
+ 1: 1000
+ 2: 999 hot_work:999
+ 4: 1 cold_work:1
+
+;--- a.ll
+source_filename = "cfi-split-lto-sample-profile.cc"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define dso_local ptr @get_callback() {
+  ret ptr @_ZL8callbacki.__uniq.12345
+}
+
+define dso_local i32 @dispatch(ptr %fp, i32 %x) {
+entry:
+  %ok = tail call i1 @llvm.type.test(ptr %fp, metadata !"_ZTSFiiE")
+  br i1 %ok, label %cont, label %trap
+
+trap:
+  tail call void @llvm.ubsantrap(i8 2)
+  unreachable
+
+cont:
+  %res = tail call i32 %fp(i32 %x)
+  ret i32 %res
+}
+
+define internal i32 @_ZL8callbacki.__uniq.12345(i32 %x) #0 !dbg !10 !type !20 {
+entry:
+  %cmp = icmp sgt i32 %x, 0, !dbg !14
+  br i1 %cmp, label %if.then, label %if.else, !dbg !14
+
+if.then:
+  %r1 = tail call i32 @hot_work(), !dbg !15
+  ret i32 %r1, !dbg !16
+
+if.else:
+  %r2 = tail call i32 @cold_work(), !dbg !17
+  ret i32 %r2, !dbg !18
+}
+
+declare i32 @hot_work()
+declare i32 @cold_work()
+declare i1 @llvm.type.test(ptr, metadata)
+declare void @llvm.ubsantrap(i8 immarg)
+
+attributes #0 = { noinline uwtable "sample-profile-suffix-elision-policy"="selected" "use-sample-profile" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang", isOptimized: true, runtimeVersion: 0, emissionKind: LineTablesOnly, splitDebugInlining: false, debugInfoForProfiling: true)
+!1 = !DIFile(filename: "cfi-split-lto-sample-profile.cc", directory: ".")
+!3 = !{i32 7, !"Dwarf Version", i32 5}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 5, !"Unique Source File Identifier", !7}
+!7 = !{!"cfi-split-lto-sample-profile.cc"}
+!10 = distinct !DISubprogram(name: "callback", linkageName: "_ZL8callbacki.__uniq.12345", scope: !1, file: !1, line: 10, type: !11, scopeLine: 10, flags: DIFlagPrototyped, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition | DISPFlagOptimized, unit: !0)
+!11 = !DISubroutineType(types: !12)
+!12 = !{}
+!14 = !DILocation(line: 11, column: 7, scope: !10)
+!15 = !DILocation(line: 12, column: 10, scope: !10)
+!16 = !DILocation(line: 12, column: 3, scope: !10)
+!17 = !DILocation(line: 14, column: 10, scope: !10)
+!18 = !DILocation(line: 14, column: 3, scope: !10)
+!20 = !{i64 0, !"_ZTSFiiE"}
diff --git a/llvm/test/ThinLTO/X86/devirt2.ll b/llvm/test/ThinLTO/X86/devirt2.ll
index 9e91efeba0da44..76d3e5129ad5b0 100644
--- a/llvm/test/ThinLTO/X86/devirt2.ll
+++ b/llvm/test/ThinLTO/X86/devirt2.ll
@@ -130,12 +130,12 @@
 ; RUN: llvm-nm %t5.1 | FileCheck %s --check-prefix=NM-HYBRID1
 ; RUN: llvm-nm %t5.2 | FileCheck %s --check-prefix=NM-HYBRID2
 
-; NM-HYBRID1-DAG: U _ZN1A1nEi.{{[0-9a-f]*}}
-; NM-HYBRID1-DAG: U _ZN1E1mEi.{{[0-9a-f]*}}
+; NM-HYBRID1-DAG: U _ZN1A1nEi.llvm.{{[0-9a-f]+}}
+; NM-HYBRID1-DAG: U _ZN1E1mEi.llvm.{{[0-9a-f]+}}
 ; NM-HYBRID1-DAG: U _ZN1D1mEi
 
-; NM-HYBRID2-DAG: T _ZN1A1nEi.{{[0-9a-f]*}}
-; NM-HYBRID2-DAG: T _ZN1E1mEi.{{[0-9a-f]*}}
+; NM-HYBRID2-DAG: T _ZN1A1nEi.llvm.{{[0-9a-f]+}}
+; NM-HYBRID2-DAG: T _ZN1E1mEi.llvm.{{[0-9a-f]+}}
 ; NM-HYBRID2-DAG: W _ZN1D1mEi
 ; NM-HYBRID2-DAG: T _ZN1B1fEi
 ; NM-HYBRID2-DAG: T _ZN1C1fEi
diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi-icall-static-inline-asm.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi-icall-static-inline-asm.ll
index 9d2ee425031ab2..d2ed57c487f737 100644
--- a/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi-icall-static-inline-asm.ll
+++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi-icall-static-inline-asm.ll
@@ -3,11 +3,11 @@
 
 target triple = "x86_64-unknown-linux-gnu"
 
-; CHECK: @a.[[HASH:[0-9a-f]+]] = hidden alias
+; CHECK: @a.llvm.[[HASH:[0-9a-f]+]] = hidden alias
 
 define void @b() {
   %f = alloca ptr, align 8
-  ; CHECK: store{{.*}} @a.[[HASH]],{{.*}} %f
+  ; CHECK: store{{.*}} @a.llvm.[[HASH]],{{.*}} %f
   store ptr @a, ptr %f, align 8
   ; CHECK: %1 = call ptr asm sideeffect "leaq a(%rip)
   %1 = call ptr asm sideeffect "leaq a(%rip), $0\0A\09", "=r,~{dirflag},~{fpsr},~{flags}"()
diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi-relative-vtable.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi-relative-vtable.ll
index c765f5eb697236..e4ee1fac12d384 100644
--- a/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi-relative-vtable.ll
+++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi-relative-vtable.ll
@@ -12,15 +12,15 @@
 
 target triple = "x86_64-unknown-linux-gnu"
 
-; M0: @rel_vtable.{{[0-9a-f]+}} = external hidden constant [1 x i32]
-; M0: @f.{{[0-9a-f]+}} = hidden alias void (), ptr @f
+; M0: @rel_vtable.llvm.{{[0-9a-f]+}} = external hidden constant [1 x i32]
+; M0: @f.llvm.{{[0-9a-f]+}} = hidden alias void (), ptr @f
 ; M0: define internal void @f()
 ; M0: define ptr @use_rel()
-; M0-NEXT: ret ptr @rel_vtable.{{[0-9a-f]+}}
+; M0-NEXT: ret ptr @rel_vtable.llvm.{{[0-9a-f]+}}
 
-; M1: @rel_vtable = internal constant [1 x i32] [i32 trunc (i64 sub (i64 ptrtoint (ptr dso_local_equivalent @f.{{[0-9a-f]+}} to i64), i64 ptrtoint (ptr @rel_vtable to i64)) to i32)]
-; M1: @rel_vtable.{{[0-9a-f]+}} = hidden alias [1 x i32], ptr @rel_vtable
-; M1: declare !guid !{{[0-9]+}} hidden void @f.{{[0-9a-f]+}}()
+; M1: @rel_vtable = internal constant [1 x i32] [i32 trunc (i64 sub (i64 ptrtoint (ptr dso_local_equivalent @f.llvm.{{[0-9a-f]+}} to i64), i64 ptrtoint (ptr @rel_vtable to i64)) to i32)]
+; M1: @rel_vtable.llvm.{{[0-9a-f]+}} = hidden alias [1 x i32], ptr @rel_vtable
+; M1: declare !guid !{{[0-9]+}} hidden void @f.llvm.{{[0-9a-f]+}}()
 @rel_vtable = internal constant [1 x i32] [
   i32 trunc (i64 sub (i64 ptrtoint (ptr dso_local_equivalent @f to i64), i64 ptrtoint (ptr @rel_vtable to i64)) to i32)
 ], !type !0
diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi_dso_local_equivalent.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi_dso_local_equivalent.ll
index b425ff0b50de73..5a5aa5ae94f2a6 100644
--- a/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi_dso_local_equivalent.ll
+++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/cfi_dso_local_equivalent.ll
@@ -9,15 +9,15 @@
 
 target triple = "x86_64-unknown-linux-gnu"
 
-; M0: @vtable.{{[0-9a-f]+}} = external hidden constant [1 x ptr]
-; M0: @f.{{[0-9a-f]+}} = hidden alias void (), ptr @f
+; M0: @vtable.llvm.{{[0-9a-f]+}} = external hidden constant [1 x ptr]
+; M0: @f.llvm.{{[0-9a-f]+}} = hidden alias void (), ptr @f
 ; M0: define internal void @f()
 ; M0: define ptr @use()
-; M0-NEXT: ret ptr @vtable.{{[0-9a-f]+}}
+; M0-NEXT: ret ptr @vtable.llvm.{{[0-9a-f]+}}
 
-; M1: @vtable = internal constant [1 x ptr] [ptr dso_local_equivalent @f.{{[0-9a-f]+}}]
-; M1: @vtable.{{[0-9a-f]+}} = hidden alias [1 x ptr], ptr @vtable
-; M1: declare !guid !{{[0-9]+}} hidden void @f.{{[0-9a-f]+}}()
+; M1: @vtable = internal constant [1 x ptr] [ptr dso_local_equivalent @f.llvm.{{[0-9a-f]+}}]
+; M1: @vtable.llvm.{{[0-9a-f]+}} = hidden alias [1 x ptr], ptr @vtable
+; M1: declare !guid !{{[0-9]+}} hidden void @f.llvm.{{[0-9a-f]+}}()
 @vtable = internal constant [1 x ptr] [
   ptr dso_local_equivalent @f
 ], !type !0
diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal-alias.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal-alias.ll
index 16769513e4c649..5fa59897766108 100644
--- a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal-alias.ll
+++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal-alias.ll
@@ -6,10 +6,10 @@
 ; RUN: llvm-dis -o - %t1 | FileCheck --check-prefix=M1 %s
 ; RUN: llvm-lto2 run %t -o %t.out \
 ; RUN:   -r=%t,use_vtable,plx \
-; RUN:   -r=%t,vtable.69cc645c8be4ef4172cfb55c93f80acd,l \
-; RUN:   -r=%t,rtti_alias.69cc645c8be4ef4172cfb55c93f80acd,plx \
-; RUN:   -r=%t,rtti_alias.69cc645c8be4ef4172cfb55c93f80acd,l \
-; RUN:   -r=%t,vtable.69cc645c8be4ef4172cfb55c93f80acd,plx
+; RUN:   -r=%t,vtable.llvm.69cc645c8be4ef4172cfb55c93f80acd,l \
+; RUN:   -r=%t,rtti_alias.llvm.69cc645c8be4ef4172cfb55c93f80acd,plx \
+; RUN:   -r=%t,rtti_alias.llvm.69cc645c8be4ef4172cfb55c93f80acd,l \
+; RUN:   -r=%t,vtable.llvm.69cc645c8be4ef4172cfb55c93f80acd,plx
 
 target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
 target triple = "aarch64-unknown-linux-gnu"
@@ -18,11 +18,11 @@ target triple = "aarch64-unknown-linux-gnu"
 @rtti_storage = private constant i8 1
 
 ; M0: @rtti_alias = internal alias i8, ptr @rtti_storage
-; M0: @rtti_alias.69cc645c8be4ef4172cfb55c93f80acd = hidden alias i8, ptr @rtti_storage
+; M0: @rtti_alias.llvm.69cc645c8be4ef4172cfb55c93f80acd = hidden alias i8, ptr @rtti_storage
 ; M0-NOT: hidden alias i8, ptr @rtti_alias{{$}}
 @rtti_alias = internal alias i8, ptr @rtti_storage
 
-; M1: @vtable = internal constant [1 x ptr] [ptr @rtti_alias.69cc645c8be4ef4172cfb55c93f80acd], !type !0
+; M1: @vtable = internal constant [1 x ptr] [ptr @rtti_alias.llvm.69cc645c8be4ef4172cfb55c93f80acd], !type !0
 @vtable = internal constant [1 x ptr] [ptr @rtti_alias], !type !0
 
 define ptr @use_vtable() {
diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal1.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal1.ll
index 89e069110fc00c..e89c2ed236c922 100644
--- a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal1.ll
+++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal1.ll
@@ -12,15 +12,15 @@
 ; BCA0: <GLOBALVAL_SUMMARY_BLOCK
 ; BCA1-NOT: <GLOBALVAL_SUMMARY_BLOCK
 
-; M0: @g.581d7631532fa146ba4061179da39272 = external hidden global i8
+; M0: @g.llvm.581d7631532fa146ba4061179da39272 = external hidden global i8
 ; M1: @g = internal global i8 42, !type !0
-; M1: @g.581d7631532fa146ba4061179da39272 = hidden alias i8, ptr @g
+; M1: @g.llvm.581d7631532fa146ba4061179da39272 = hidden alias i8, ptr @g
 @g = internal global i8 42, !type !0
 
 ; M0: define ptr @f()
 ; M1-NOT: @f()
 define ptr @f() {
-  ; M0: ret ptr @g.581d7631532fa146ba4061179da39272
+  ; M0: ret ptr @g.llvm.581d7631532fa146ba4061179da39272
   ret ptr @g
 }
 
diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal2.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal2.ll
index b5c4a2f88faf97..7798d46d3ec956 100644
--- a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal2.ll
+++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-internal2.ll
@@ -17,12 +17,12 @@ target triple = "x86_64-unknown-linux-gnu"
 ; BCA1-NOT: <GLOBALVAL_SUMMARY_BLOCK
 
 ; M0: @g = external global ptr
-; M1: @g = global ptr @f.13757e0fb71915e385efa4dc9d1e08fd, !type !0
+; M1: @g = global ptr @f.llvm.13757e0fb71915e385efa4dc9d1e08fd, !type !0
 @g = global ptr @f, !type !0
 
-; M0: @f.13757e0fb71915e385efa4dc9d1e08fd = hidden alias void (), ptr @f
+; M0: @f.llvm.13757e0fb71915e385efa4dc9d1e08fd = hidden alias void (), ptr @f
 ; M0: define internal void @f()
-; M1: declare !guid !{{[0-9]+}} hidden void @f.13757e0fb71915e385efa4dc9d1e08fd()
+; M1: declare !guid !{{[0-9]+}} hidden void @f.llvm.13757e0fb71915e385efa4dc9d1e08fd()
 define internal void @f() {
   call void @f2()
   ret void
@@ -36,7 +36,7 @@ define internal void @f2() {
 ; M1: !0 = !{i32 0, !"typeid"}
 !0 = !{i32 0, !"typeid"}
 
-; test that the GUID of f.<hash> is the same in the summaries of the 2 split
+; test that the GUID of f.llvm.<hash> is the same in the summaries of the 2 split
 ; modules
-; M0: = gv: (name: "f.13757e0fb71915e385efa4dc9d1e08fd", {{.*}} ; guid = 11302379072751562722
-; M1: = gv: (name: "f.13757e0fb71915e385efa4dc9d1e08fd") ; guid = 11302379072751562722
+; M0: = gv: (name: "f.llvm.13757e0fb71915e385efa4dc9d1e08fd", {{.*}} ; guid = 6679340139730181434
+; M1: = gv: (name: "f.llvm.13757e0fb71915e385efa4dc9d1e08fd") ; guid = 6679340139730181434
diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-vfunc-internal.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-vfunc-internal.ll
index 11ab5f8ea99058..fb376276851d6e 100644
--- a/llvm/test/Transforms/ThinLTOBitcodeWriter/split-vfunc-internal.ll
+++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/split-vfunc-internal.ll
@@ -9,16 +9,16 @@ define ptr @source() {
   ret ptr @g
 }
 
-; M0: @g.84f59439b469192440047efc8de357fb = external hidden constant [1 x ptr]
-; M1: @g = internal constant [1 x ptr] [ptr @ok.84f59439b469192440047efc8de357fb]
-; M1: @g.84f59439b469192440047efc8de357fb = hidden alias [1 x ptr], ptr @g
+; M0: @g.llvm.84f59439b469192440047efc8de357fb = external hidden constant [1 x ptr]
+; M1: @g = internal constant [1 x ptr] [ptr @ok.llvm.84f59439b469192440047efc8de357fb]
+; M1: @g.llvm.84f59439b469192440047efc8de357fb = hidden alias [1 x ptr], ptr @g
 @g = internal constant [1 x ptr] [
   ptr @ok
 ], !type !0
 
-; M0: @ok.84f59439b469192440047efc8de357fb = hidden alias i64 (ptr), ptr @ok
+; M0: @ok.llvm.84f59439b469192440047efc8de357fb = hidden alias i64 (ptr), ptr @ok
 ; M0: define internal i64 @ok(ptr %this)
-; M1: define available_externally hidden i64 @ok.84f59439b469192440047efc8de357fb
+; M1: define available_externally hidden i64 @ok.llvm.84f59439b469192440047efc8de357fb
 define internal i64 @ok(ptr %this) {
   ret i64 42
 }
diff --git a/llvm/test/Transforms/ThinLTOBitcodeWriter/unique-source-file-names.ll b/llvm/test/Transforms/ThinLTOBitcodeWriter/unique-source-file-names.ll
index 13dcefcb70cb5b..7b0b7fba69c6de 100644
--- a/llvm/test/Transforms/ThinLTOBitcodeWriter/unique-source-file-names.ll
+++ b/llvm/test/Transforms/ThinLTOBitcodeWriter/unique-source-file-names.ll
@@ -6,7 +6,7 @@ source_filename = "unique-source-file-names.c"
 
 @llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @f, ptr null }]
 
-; CHECK: @g.45934e8a5251fb7adbecfff71a4e70ed =
+; CHECK: @g.llvm.45934e8a5251fb7adbecfff71a4e70ed =
 @g = internal global i8 42, !type !0
 
 declare void @sink(ptr)
diff --git a/llvm/test/tools/llvm-reduce/temporary-files-as-bitcode-split.ll b/llvm/test/tools/llvm-reduce/temporary-files-as-bitcode-split.ll
index 006382252ba756..cf8208cf067a32 100644
--- a/llvm/test/tools/llvm-reduce/temporary-files-as-bitcode-split.ll
+++ b/llvm/test/tools/llvm-reduce/temporary-files-as-bitcode-split.ll
@@ -20,7 +20,7 @@ entry:
   ret void
 }
 define ptr @f() {
-  ; CHECK-ALL: ret ptr @g.{{([0-9a-f]{32})}}
+  ; CHECK-ALL: ret ptr @g.llvm.{{([0-9a-f]{32})}}
   ret ptr @g
 }
 
diff --git a/llvm/tools/llvm-lto2/llvm-lto2.cpp b/llvm/tools/llvm-lto2/llvm-lto2.cpp
index 506262b7c0d53d..6f2edbc9512462 100644
--- a/llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ b/llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -20,6 +20,7 @@
 #include "llvm/CodeGen/CommandFlags.h"
 #include "llvm/DTLTO/DTLTO.h"
 #include "llvm/IR/DiagnosticPrinter.h"
+#include "llvm/IR/ModuleSummaryIndex.h"
 #include "llvm/LTO/LTO.h"
 #include "llvm/Remarks/HotnessThresholdParser.h"
 #include "llvm/Support/Caching.h"
@@ -497,13 +498,19 @@ static int run(int argc, char **argv) {
     std::vector<SymbolResolution> Res;
     for (const InputFile::Symbol &Sym : Input->symbols()) {
       auto I = CommandLineResolutions.find({F, std::string(Sym.getName())});
-      // If it isn't found, look for ".", which would have been added
-      // (followed by a hash) when the symbol was promoted during module
-      // splitting if it was defined in one part and used in the other.
+      // If it isn't found, look for ".llvm." (or legacy "."), which would have
+      // been added (followed by a hash) when the symbol was promoted during
+      // module splitting if it was defined in one part and used in the other.
       // Try looking up the symbol name before the suffix.
       if (I == CommandLineResolutions.end()) {
-        auto SplitName = Sym.getName().rsplit(".");
-        I = CommandLineResolutions.find({F, std::string(SplitName.first)});
+        StringRef OrigName =
+            ModuleSummaryIndex::getOriginalNameBeforePromote(Sym.getName());
+        if (OrigName != Sym.getName())
+          I = CommandLineResolutions.find({F, std::string(OrigName)});
+        if (I == CommandLineResolutions.end()) {
+          auto SplitName = Sym.getName().rsplit(".");
+          I = CommandLineResolutions.find({F, std::string(SplitName.first)});
+        }
       }
       if (I == CommandLineResolutions.end()) {
         llvm::errs() << argv[0] << ": missing symbol resolution for " << F



More information about the llvm-branch-commits mailing list