Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit 50fb516

Browse files
zmodemzmodem
committed
Merging r322900 and r323307:
------------------------------------------------------------------------ r322900 | mstorsjo | 2018-01-18 22:21:48 +0100 (Thu, 18 Jan 2018) | 6 lines [test] Actually check the common parts in CodeGen/ARM/global-merge-external.ll. NFC. Previously, these parts weren't ever checked. The label patterns need to be extended to match successfully on macho. Differential Revision: https://reviews.llvm.org/D42126 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r323307 | mstorsjo | 2018-01-24 07:40:04 +0100 (Wed, 24 Jan 2018) | 6 lines [GlobalMerge] Don't merge dllexport globals Merging such globals loses the dllexport attribute. Add a test to check that normal globals still are merged. Differential Revision: https://reviews.llvm.org/D42127 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_60@323337 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 093b172 commit 50fb516

File tree

3 files changed

+39
-8
lines changed

3 files changed

+39
-8
lines changed

‎lib/CodeGen/GlobalMerge.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,8 @@ bool GlobalMerge::doInitialization(Module &M) {
577577
for (auto &GV : M.globals()) {
578578
// Merge is safe for "normal" internal or external globals only
579579
if (GV.isDeclaration() || GV.isThreadLocal() ||
580-
GV.hasSection() || GV.hasImplicitSection())
580+
GV.hasSection() || GV.hasImplicitSection() ||
581+
GV.hasDLLExportStorageClass())
581582
continue;
582583

583584
// It's not safe to merge globals that may be preempted

‎test/CodeGen/ARM/global-merge-dllexport.ll

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
; RUN: llc < %s -mtriple=thumbv7-win32 -arm-global-merge | FileCheck %s
2+
3+
@x = global i32 0, align 4
4+
@y = dllexport global i32 0, align 4
5+
6+
define void @f1(i32 %a1, i32 %a2) {
7+
; CHECK: f1:
8+
; CHECK: movw [[REG1:r[0-9]+]], :lower16:x
9+
; CHECK: movt [[REG1]], :upper16:x
10+
store i32 %a1, i32* @x, align 4
11+
store i32 %a2, i32* @y, align 4
12+
ret void
13+
}
14+
15+
; CHECK-NOT: .L_MergedGlobals

‎test/CodeGen/ARM/global-merge-external.ll

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,37 @@
1-
; RUN: llc < %s -mtriple=arm-eabi -arm-global-merge | FileCheck %s --check-prefix=CHECK-MERGE
2-
; RUN: llc < %s -mtriple=arm-eabi -arm-global-merge -global-merge-on-external=true | FileCheck %s --check-prefix=CHECK-MERGE
3-
; RUN: llc < %s -mtriple=arm-eabi -arm-global-merge -global-merge-on-external=false | FileCheck %s --check-prefix=CHECK-NO-MERGE
4-
; RUN: llc < %s -mtriple=arm-macho -arm-global-merge | FileCheck %s --check-prefix=CHECK-NO-MERGE
5-
; RUN: llc < %s -mtriple=arm-eabi -arm-global-merge -relocation-model=pic | FileCheck %s --check-prefix=CHECK-NO-MERGE
1+
; RUN: llc < %s -mtriple=arm-eabi -arm-global-merge | FileCheck %s --check-prefixes=CHECK,CHECK-MERGE
2+
; RUN: llc < %s -mtriple=arm-eabi -arm-global-merge -global-merge-on-external=true | FileCheck %s --check-prefixes=CHECK,CHECK-MERGE
3+
; RUN: llc < %s -mtriple=arm-eabi -arm-global-merge -global-merge-on-external=false | FileCheck %s --check-prefixes=CHECK,CHECK-NO-MERGE
4+
; RUN: llc < %s -mtriple=arm-macho -arm-global-merge | FileCheck %s --check-prefixes=CHECK,CHECK-NO-MERGE
5+
; RUN: llc < %s -mtriple=arm-eabi -arm-global-merge -relocation-model=pic | FileCheck %s --check-prefixes=CHECK,CHECK-NO-MERGE
6+
; RUN: llc < %s -mtriple=thumbv7-win32 -arm-global-merge | FileCheck %s --check-prefixes=CHECK-WIN32
67

78
@x = global i32 0, align 4
89
@y = global i32 0, align 4
910
@z = global i32 0, align 4
1011

1112
define void @f1(i32 %a1, i32 %a2) {
1213
;CHECK: f1:
13-
;CHECK: ldr {{r[0-9]+}}, [[LABEL1:\.LCPI[0-9]+_[0-9]]]
14+
;CHECK: ldr {{r[0-9]+}}, [[LABEL1:\.?LCPI[0-9]+_[0-9]]]
1415
;CHECK: [[LABEL1]]:
1516
;CHECK-MERGE: .long .L_MergedGlobals
1617
;CHECK-NO-MERGE: .long {{_?x}}
18+
;CHECK-WIN32: f1:
19+
;CHECK-WIN32: movw [[REG1:r[0-9]+]], :lower16:.L_MergedGlobals
20+
;CHECK-WIN32: movt [[REG1]], :upper16:.L_MergedGlobals
1721
store i32 %a1, i32* @x, align 4
1822
store i32 %a2, i32* @y, align 4
1923
ret void
2024
}
2125

2226
define void @g1(i32 %a1, i32 %a2) {
2327
;CHECK: g1:
24-
;CHECK: ldr {{r[0-9]+}}, [[LABEL2:\.LCPI[0-9]+_[0-9]]]
28+
;CHECK: ldr {{r[0-9]+}}, [[LABEL2:\.?LCPI[0-9]+_[0-9]]]
2529
;CHECK: [[LABEL2]]:
2630
;CHECK-MERGE: .long .L_MergedGlobals
2731
;CHECK-NO-MERGE: .long {{_?y}}
32+
;CHECK-WIN32: g1:
33+
;CHECK-WIN32: movw [[REG2:r[0-9]+]], :lower16:.L_MergedGlobals
34+
;CHECK-WIN32: movt [[REG2]], :upper16:.L_MergedGlobals
2835
store i32 %a1, i32* @y, align 4
2936
store i32 %a2, i32* @z, align 4
3037
ret void
@@ -35,6 +42,7 @@ define void @g1(i32 %a1, i32 %a2) {
3542
;CHECK-MERGE: .type .L_MergedGlobals,%object
3643
;CHECK-MERGE: .local .L_MergedGlobals
3744
;CHECK-MERGE: .comm .L_MergedGlobals,12,4
45+
;CHECK-WIN32: .lcomm .L_MergedGlobals,12,4
3846

3947
;CHECK-MERGE: .globl x
4048
;CHECK-MERGE: x = .L_MergedGlobals
@@ -45,3 +53,10 @@ define void @g1(i32 %a1, i32 %a2) {
4553
;CHECK-MERGE: .globl z
4654
;CHECK-MERGE: z = .L_MergedGlobals+8
4755
;CHECK-MERGE: .size z, 4
56+
57+
;CHECK-WIN32: .globl x
58+
;CHECK-WIN32: x = .L_MergedGlobals
59+
;CHECK-WIN32: .globl y
60+
;CHECK-WIN32: y = .L_MergedGlobals+4
61+
;CHECK-WIN32: .globl z
62+
;CHECK-WIN32: z = .L_MergedGlobals+8

0 commit comments

Comments
 (0)