Skip to content

Commit e5d0627

Browse files
hahnjohahnjo
authored
[ORC] Preserve order of constructors with same priority (#95532)
Constructors with the same priority should keep their relative order that was specified. This is important for `clang-repl` with many `const` variables after commit 05137ec ("[clang-repl] Emit const variables only once").
1 parent 5996496 commit e5d0627

File tree

2 files changed

+174
-1
lines changed

2 files changed

+174
-1
lines changed

‎llvm/lib/ExecutionEngine/Orc/LLJIT.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ GlobalCtorDtorScraper::operator()(ThreadSafeModule TSM,
538538

539539
for (auto E : COrDtors)
540540
InitsOrDeInits.push_back(std::make_pair(E.Func, E.Priority));
541-
llvm::sort(InitsOrDeInits, llvm::less_second());
541+
llvm::stable_sort(InitsOrDeInits, llvm::less_second());
542542

543543
auto *InitOrDeInitFuncEntryBlock =
544544
BasicBlock::Create(Ctx, "entry", InitOrDeInitFunc);

‎llvm/test/ExecutionEngine/Orc/global-ctor-order.ll

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
; Test that global constructors are correctly ordered
2+
;
3+
; RUN: lli -jit-kind=orc %s | FileCheck %s
4+
;
5+
; CHECK: H1
6+
; CHECK-NEXT: H2
7+
; CHECK-NEXT: H3
8+
; CHECK-NEXT: M1
9+
; CHECK-NEXT: M2
10+
; CHECK-NEXT: M3
11+
; CHECK-NEXT: 1
12+
; CHECK-NEXT: 2
13+
; CHECK-NEXT: 3
14+
; CHECK-NEXT: 4
15+
; CHECK-NEXT: 5
16+
; CHECK-NEXT: 6
17+
; CHECK-NEXT: 7
18+
; CHECK-NEXT: 8
19+
; CHECK-NEXT: 9
20+
; CHECK-NEXT: 10
21+
; CHECK-NEXT: 11
22+
; CHECK-NEXT: 12
23+
; CHECK-NEXT: 13
24+
; CHECK-NEXT: 14
25+
; CHECK-NEXT: 15
26+
; CHECK-NEXT: 16
27+
; CHECK-NEXT: 17
28+
29+
declare i32 @puts(ptr)
30+
31+
@str.H1 = private constant [3 x i8] c"H1\00"
32+
@str.H2 = private constant [3 x i8] c"H2\00"
33+
@str.H3 = private constant [3 x i8] c"H3\00"
34+
@str.M1 = private constant [3 x i8] c"M1\00"
35+
@str.M2 = private constant [3 x i8] c"M2\00"
36+
@str.M3 = private constant [3 x i8] c"M3\00"
37+
@str.1 = private constant [2 x i8] c"1\00"
38+
@str.2 = private constant [2 x i8] c"2\00"
39+
@str.3 = private constant [2 x i8] c"3\00"
40+
@str.4 = private constant [2 x i8] c"4\00"
41+
@str.5 = private constant [2 x i8] c"5\00"
42+
@str.6 = private constant [2 x i8] c"6\00"
43+
@str.7 = private constant [2 x i8] c"7\00"
44+
@str.8 = private constant [2 x i8] c"8\00"
45+
@str.9 = private constant [2 x i8] c"9\00"
46+
@str.10 = private constant [3 x i8] c"10\00"
47+
@str.11 = private constant [3 x i8] c"11\00"
48+
@str.12 = private constant [3 x i8] c"12\00"
49+
@str.13 = private constant [3 x i8] c"13\00"
50+
@str.14 = private constant [3 x i8] c"14\00"
51+
@str.15 = private constant [3 x i8] c"15\00"
52+
@str.16 = private constant [3 x i8] c"16\00"
53+
@str.17 = private constant [3 x i8] c"17\00"
54+
@llvm.global_ctors = appending global [23 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 1024, ptr @medium.1, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.1, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.2, ptr null }, { i32, ptr, ptr } { i32 1, ptr @high.1, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.3, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.4, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.5, ptr null }, { i32, ptr, ptr } { i32 1, ptr @high.2, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.6, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.7, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.8, ptr null }, { i32, ptr, ptr } { i32 1024, ptr @medium.2, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.9, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.10, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.11, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.12, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.13, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.14, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.15, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.16, ptr null }, { i32, ptr, ptr } { i32 65535, ptr @default.17, ptr null }, { i32, ptr, ptr } { i32 1024, ptr @medium.3, ptr null }, { i32, ptr, ptr } { i32 1, ptr @high.3, ptr null }]
55+
56+
define internal i32 @high.1() #0 {
57+
%call = tail call i32 @puts(ptr @str.H1)
58+
ret i32 0
59+
}
60+
61+
define internal i32 @high.2() #0 {
62+
%call = tail call i32 @puts(ptr @str.H2)
63+
ret i32 0
64+
}
65+
66+
define internal i32 @high.3() #0 {
67+
%call = tail call i32 @puts(ptr @str.H3)
68+
ret i32 0
69+
}
70+
71+
define internal i32 @medium.1() #0 {
72+
%call = tail call i32 @puts(ptr @str.M1)
73+
ret i32 0
74+
}
75+
76+
define internal i32 @medium.2() #0 {
77+
%call = tail call i32 @puts(ptr @str.M2)
78+
ret i32 0
79+
}
80+
81+
define internal i32 @medium.3() #0 {
82+
%call = tail call i32 @puts(ptr @str.M3)
83+
ret i32 0
84+
}
85+
86+
define internal i32 @default.1() #0 {
87+
%call = tail call i32 @puts(ptr @str.1)
88+
ret i32 0
89+
}
90+
91+
define internal i32 @default.2() #0 {
92+
%call = tail call i32 @puts(ptr @str.2)
93+
ret i32 0
94+
}
95+
96+
define internal i32 @default.3() #0 {
97+
%call = tail call i32 @puts(ptr @str.3)
98+
ret i32 0
99+
}
100+
101+
define internal i32 @default.4() #0 {
102+
%call = tail call i32 @puts(ptr @str.4)
103+
ret i32 0
104+
}
105+
106+
define internal i32 @default.5() #0 {
107+
%call = tail call i32 @puts(ptr @str.5)
108+
ret i32 0
109+
}
110+
111+
define internal i32 @default.6() #0 {
112+
%call = tail call i32 @puts(ptr @str.6)
113+
ret i32 0
114+
}
115+
116+
define internal i32 @default.7() #0 {
117+
%call = tail call i32 @puts(ptr @str.7)
118+
ret i32 0
119+
}
120+
121+
define internal i32 @default.8() #0 {
122+
%call = tail call i32 @puts(ptr @str.8)
123+
ret i32 0
124+
}
125+
126+
define internal i32 @default.9() #0 {
127+
%call = tail call i32 @puts(ptr @str.9)
128+
ret i32 0
129+
}
130+
131+
define internal i32 @default.10() #0 {
132+
%call = tail call i32 @puts(ptr @str.10)
133+
ret i32 0
134+
}
135+
136+
define internal i32 @default.11() #0 {
137+
%call = tail call i32 @puts(ptr @str.11)
138+
ret i32 0
139+
}
140+
141+
define internal i32 @default.12() #0 {
142+
%call = tail call i32 @puts(ptr @str.12)
143+
ret i32 0
144+
}
145+
146+
define internal i32 @default.13() #0 {
147+
%call = tail call i32 @puts(ptr @str.13)
148+
ret i32 0
149+
}
150+
151+
define internal i32 @default.14() #0 {
152+
%call = tail call i32 @puts(ptr @str.14)
153+
ret i32 0
154+
}
155+
156+
define internal i32 @default.15() #0 {
157+
%call = tail call i32 @puts(ptr @str.15)
158+
ret i32 0
159+
}
160+
161+
define internal i32 @default.16() #0 {
162+
%call = tail call i32 @puts(ptr @str.16)
163+
ret i32 0
164+
}
165+
166+
define internal i32 @default.17() #0 {
167+
%call = tail call i32 @puts(ptr @str.17)
168+
ret i32 0
169+
}
170+
171+
define i32 @main() {
172+
ret i32 0
173+
}

0 commit comments

Comments
 (0)