Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion llvm/lib/CodeGen/GlobalMerge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ bool GlobalMergeImpl::run(Module &M) {
continue;

if (!(Opt.MergeExternal && GV.hasExternalLinkage()) &&
!GV.hasInternalLinkage())
!GV.hasLocalLinkage())
continue;

PointerType *PT = dyn_cast<PointerType>(GV.getType());
Expand Down
36 changes: 36 additions & 0 deletions llvm/test/Transforms/GlobalMerge/private-global.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
; RUN: opt -global-merge -global-merge-max-offset=100 -S -o - %s | FileCheck %s
; RUN: opt -passes='global-merge<max-offset=100>' -S -o - %s | FileCheck %s

; NOTE: This is a copy of the llvm/test/Transforms/GlobalMerge/basic.ll test,
; using `private` global variables instead of `internal`. This is to show that
; that private globals can be merged in the GlobalMerge pass.

target datalayout = "e-p:64:64"
target triple = "x86_64-unknown-linux-gnu"

; CHECK: @_MergedGlobals = private global <{ i32, i32 }> <{ i32 1, i32 2 }>, align 4
; CHECK: @_MergedGlobals.1 = private global <{ i32, i32 }> <{ i32 3, i32 4 }>, section "foo", align 4

; CHECK-DAG: @a = private alias i32, ptr @_MergedGlobals{{$}}
@a = private global i32 1

; CHECK-DAG: @b = private alias i32, getelementptr inbounds (<{ i32, i32 }>, ptr @_MergedGlobals, i32 0, i32 1)
@b = private global i32 2

; CHECK-DAG: @c = private alias i32, ptr @_MergedGlobals.1{{$}}
@c = private global i32 3, section "foo"

; CHECK-DAG: @d = private alias i32, getelementptr inbounds (<{ i32, i32 }>, ptr @_MergedGlobals.1, i32 0, i32 1)
@d = private global i32 4, section "foo"

define void @use_private() {
; CHECK: load i32, ptr @_MergedGlobals,
%x = load i32, ptr @a
; CHECK: load i32, ptr getelementptr inbounds (<{ i32, i32 }>, ptr @_MergedGlobals, i32 0, i32 1)
%y = load i32, ptr @b
; CHECK: load i32, ptr @_MergedGlobals.1
%z1 = load i32, ptr @c
; CHECK: load i32, ptr getelementptr inbounds (<{ i32, i32 }>, ptr @_MergedGlobals.1, i32 0, i32 1)
%z2 = load i32, ptr @d
ret void
}