ddc27f7cd3
Also backport fix for https://bugzilla.redhat.com/show_bug.cgi?id=2352554. Synched with fedora commit c6bd7afb53a5a3aea23a1c4190064aa3f743272d Resolves: RHEL-81006
47 lines
2.1 KiB
Diff
47 lines
2.1 KiB
Diff
From d25887408ee9fb78d68787ff7388cba254aced6f Mon Sep 17 00:00:00 2001
|
|
From: Nikita Popov <npopov@redhat.com>
|
|
Date: Tue, 18 Mar 2025 14:36:06 +0100
|
|
Subject: [PATCH] [GlobalMerge][PPC] Don't merge globals in llvm.metadata
|
|
section
|
|
|
|
The llvm.metadata section is not emitted and has special semantics.
|
|
We should not merge globals in it, similarly to how we already
|
|
skip merging of `llvm.xyz` globals.
|
|
|
|
Fixes https://github.com/llvm/llvm-project/issues/131394.
|
|
---
|
|
llvm/lib/CodeGen/GlobalMerge.cpp | 3 ++-
|
|
llvm/test/CodeGen/PowerPC/global-merge-llvm-metadata.ll | 9 +++++++++
|
|
2 files changed, 11 insertions(+), 1 deletion(-)
|
|
create mode 100644 llvm/test/CodeGen/PowerPC/global-merge-llvm-metadata.ll
|
|
|
|
diff --git a/llvm/lib/CodeGen/GlobalMerge.cpp b/llvm/lib/CodeGen/GlobalMerge.cpp
|
|
index 1aedc447935b7..ca743918cec24 100644
|
|
--- a/llvm/lib/CodeGen/GlobalMerge.cpp
|
|
+++ b/llvm/lib/CodeGen/GlobalMerge.cpp
|
|
@@ -711,7 +711,8 @@ bool GlobalMergeImpl::run(Module &M) {
|
|
continue;
|
|
|
|
// Ignore all 'special' globals.
|
|
- if (GV.getName().starts_with("llvm.") || GV.getName().starts_with(".llvm."))
|
|
+ if (GV.getName().starts_with("llvm.") ||
|
|
+ GV.getName().starts_with(".llvm.") || Section == "llvm.metadata")
|
|
continue;
|
|
|
|
// Ignore all "required" globals:
|
|
diff --git a/llvm/test/CodeGen/PowerPC/global-merge-llvm-metadata.ll b/llvm/test/CodeGen/PowerPC/global-merge-llvm-metadata.ll
|
|
new file mode 100644
|
|
index 0000000000000..7db092e13afeb
|
|
--- /dev/null
|
|
+++ b/llvm/test/CodeGen/PowerPC/global-merge-llvm-metadata.ll
|
|
@@ -0,0 +1,9 @@
|
|
+; RUN: llc -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s
|
|
+
|
|
+@index = global i32 0, align 4
|
|
+@.str = private unnamed_addr constant [1 x i8] zeroinitializer, section "llvm.metadata"
|
|
+@.str.1 = private unnamed_addr constant [7 x i8] c"test.c\00", section "llvm.metadata"
|
|
+@llvm.global.annotations = appending global [1 x { ptr, ptr, ptr, i32, ptr }] [{ ptr, ptr, ptr, i32, ptr } { ptr @index, ptr @.str, ptr @.str.1, i32 1, ptr null }], section "llvm.metadata"
|
|
+
|
|
+; CHECK-NOT: .set
|
|
+; CHECK-NOT: _MergedGlobals
|