Skip to content

Commit 3e7e40e

Browse files
ZentrikZentrik
authored
Rebase patches (#51)
1 parent 77959b6 commit 3e7e40e

15 files changed

+69
-47
lines changed

‎julia-patches/1b7b3b8d354a28f5fb1381c61c5663819d29a974‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1b7a90a8a167b127c0f48b6cb4a486caa12b7249 Mon Sep 17 00:00:00 2001
1+
From 6d83e9e2e243b714ff130153b7be43490a94228a Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Fri, 8 Nov 2024 21:02:11 +0000
44
Subject: [PATCH] 1b7b3b8d354a28f5fb1381c61c5663819d29a974

‎julia-patches/29441e4f5fa5f5c7709f7cf180815ba97f611297‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1b786a0511f3a23c59dde4637b0d41eca5af23e5 Mon Sep 17 00:00:00 2001
1+
From cfc9b63f66317462eb1c888541a6434b6b135fd3 Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Tue, 4 Feb 2025 20:44:02 +0000
44
Subject: [PATCH] 29441e4f5fa5f5c7709f7cf180815ba97f611297
@@ -9,10 +9,10 @@ Adapt to removal of NoCapture
99
1 file changed, 10 insertions(+), 10 deletions(-)
1010

1111
diff --git a/src/codegen.cpp b/src/codegen.cpp
12-
index 1011cecc73..c00f05edc9 100644
12+
index b3724e33d2..adfc338d1d 100644
1313
--- a/src/codegen.cpp
1414
+++ b/src/codegen.cpp
15-
@@ -628,7 +628,7 @@ static AttributeList get_func_attrs(LLVMContext &C)
15+
@@ -614,7 +614,7 @@ static AttributeList get_func_attrs(LLVMContext &C)
1616
AttributeSet(),
1717
Attributes(C, {Attribute::NonNull}),
1818
{AttributeSet(),
@@ -21,7 +21,7 @@ index 1011cecc73..c00f05edc9 100644
2121
}
2222

2323
static AttributeList get_donotdelete_func_attrs(LLVMContext &C)
24-
@@ -1031,7 +1031,7 @@ static const auto jllockvalue_func = new JuliaFunction<>{
24+
@@ -1017,7 +1017,7 @@ static const auto jllockvalue_func = new JuliaFunction<>{
2525
[](LLVMContext &C) { return AttributeList::get(C,
2626
AttributeSet(),
2727
AttributeSet(),
@@ -30,7 +30,7 @@ index 1011cecc73..c00f05edc9 100644
3030
};
3131
static const auto jlunlockvalue_func = new JuliaFunction<>{
3232
XSTR(jl_unlock_value),
33-
@@ -1040,7 +1040,7 @@ static const auto jlunlockvalue_func = new JuliaFunction<>{
33+
@@ -1026,7 +1026,7 @@ static const auto jlunlockvalue_func = new JuliaFunction<>{
3434
[](LLVMContext &C) { return AttributeList::get(C,
3535
AttributeSet(),
3636
AttributeSet(),
@@ -39,7 +39,7 @@ index 1011cecc73..c00f05edc9 100644
3939
};
4040
static const auto jllockfield_func = new JuliaFunction<>{
4141
XSTR(jl_lock_field),
42-
@@ -1049,7 +1049,7 @@ static const auto jllockfield_func = new JuliaFunction<>{
42+
@@ -1035,7 +1035,7 @@ static const auto jllockfield_func = new JuliaFunction<>{
4343
[](LLVMContext &C) { return AttributeList::get(C,
4444
AttributeSet(),
4545
AttributeSet(),
@@ -48,7 +48,7 @@ index 1011cecc73..c00f05edc9 100644
4848
};
4949
static const auto jlunlockfield_func = new JuliaFunction<>{
5050
XSTR(jl_unlock_field),
51-
@@ -1058,7 +1058,7 @@ static const auto jlunlockfield_func = new JuliaFunction<>{
51+
@@ -1044,7 +1044,7 @@ static const auto jlunlockfield_func = new JuliaFunction<>{
5252
[](LLVMContext &C) { return AttributeList::get(C,
5353
AttributeSet(),
5454
AttributeSet(),
@@ -57,7 +57,7 @@ index 1011cecc73..c00f05edc9 100644
5757
};
5858
static const auto jlenter_func = new JuliaFunction<>{
5959
XSTR(jl_enter_handler),
60-
@@ -1528,7 +1528,7 @@ static const auto gc_loaded_func = new JuliaFunction<>{
60+
@@ -1514,7 +1514,7 @@ static const auto gc_loaded_func = new JuliaFunction<>{
6161
RetAttrs.addAttribute(Attribute::NonNull);
6262
RetAttrs.addAttribute(Attribute::NoUndef);
6363
return AttributeList::get(C, AttributeSet::get(C,FnAttrs), AttributeSet::get(C,RetAttrs),
@@ -66,7 +66,7 @@ index 1011cecc73..c00f05edc9 100644
6666
Attributes(C, {Attribute::NonNull, Attribute::NoUndef, Attribute::ReadNone}) });
6767
},
6868
};
69-
@@ -8382,7 +8382,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
69+
@@ -8367,7 +8367,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
7070
AttrBuilder param(M->getContext());
7171
param.addStructRetAttr(srt);
7272
param.addAttribute(Attribute::NoAlias);
@@ -75,7 +75,7 @@ index 1011cecc73..c00f05edc9 100644
7575
param.addAttribute(Attribute::NoUndef);
7676
attrs.push_back(AttributeSet::get(M->getContext(), param));
7777
assert(fsig.size() == 1);
78-
@@ -8390,7 +8390,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
78+
@@ -8375,7 +8375,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
7979
if (props.cc == jl_returninfo_t::Union) {
8080
AttrBuilder param(M->getContext());
8181
param.addAttribute(Attribute::NoAlias);
@@ -84,7 +84,7 @@ index 1011cecc73..c00f05edc9 100644
8484
param.addAttribute(Attribute::NoUndef);
8585
attrs.push_back(AttributeSet::get(M->getContext(), param));
8686
assert(fsig.size() == 1);
87-
@@ -8399,7 +8399,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
87+
@@ -8384,7 +8384,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
8888
if (props.return_roots) {
8989
AttrBuilder param(M->getContext());
9090
param.addAttribute(Attribute::NoAlias);
@@ -93,7 +93,7 @@ index 1011cecc73..c00f05edc9 100644
9393
param.addAttribute(Attribute::NoUndef);
9494
attrs.push_back(AttributeSet::get(M->getContext(), param));
9595
fsig.push_back(getPointerTy(M->getContext()));
96-
@@ -8432,7 +8432,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
96+
@@ -8417,7 +8417,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
9797
AttrBuilder param(M->getContext());
9898
Type *ty = et;
9999
if (et == nullptr || et->isAggregateType()) { // aggregate types are passed by pointer

‎julia-patches/29e467fc78eb8b4308b57272ca4ad0d1f744f25f‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a08053f12454a54a1887cd95aad5652894a5e8ca Mon Sep 17 00:00:00 2001
1+
From ea139ae833743fae1e9b02f58ff2b1bb9de7d5b7 Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Sat, 4 Jan 2025 16:48:45 +0000
44
Subject: [PATCH] 29e467fc78eb8b4308b57272ca4ad0d1f744f25f
@@ -133,10 +133,10 @@ index c1796d907e..03335cf156 100644
133133
for_each_uniontype_small(
134134
[&](unsigned idx, jl_datatype_t *jt) {
135135
diff --git a/src/codegen.cpp b/src/codegen.cpp
136-
index e27e2ec7d9..1011cecc73 100644
136+
index baa05fbc30..b3724e33d2 100644
137137
--- a/src/codegen.cpp
138138
+++ b/src/codegen.cpp
139-
@@ -838,7 +838,7 @@ static const auto jlhasnofield_func = new JuliaFunction<>{
139+
@@ -824,7 +824,7 @@ static const auto jlhasnofield_func = new JuliaFunction<>{
140140
static const auto jlboundserrorv_func = new JuliaFunction<TypeFnContextAndSizeT>{
141141
XSTR(jl_bounds_error_ints),
142142
[](LLVMContext &C, Type *T_size) { return FunctionType::get(getVoidTy(C),
@@ -145,7 +145,7 @@ index e27e2ec7d9..1011cecc73 100644
145145
get_attrs_noreturn,
146146
};
147147
static const auto jlboundserror_func = new JuliaFunction<TypeFnContextAndSizeT>{
148-
@@ -1306,13 +1306,13 @@ static const auto memcmp_func = new JuliaFunction<TypeFnContextAndSizeT>{
148+
@@ -1292,13 +1292,13 @@ static const auto memcmp_func = new JuliaFunction<TypeFnContextAndSizeT>{
149149
};
150150
static const auto jldlsym_func = new JuliaFunction<>{
151151
XSTR(jl_load_and_lookup),
@@ -162,7 +162,7 @@ index e27e2ec7d9..1011cecc73 100644
162162
{JuliaType::get_prjlvalue_ty(C), getPointerTy(C)}, false); },
163163
nullptr,
164164
};
165-
@@ -1379,7 +1379,7 @@ static const auto jlgetcfunctiontrampoline_func = new JuliaFunction<>{
165+
@@ -1365,7 +1365,7 @@ static const auto jlgetcfunctiontrampoline_func = new JuliaFunction<>{
166166
T_pjlvalue, // result
167167
getPointerTy(C), // cache
168168
T_pjlvalue, // fill
@@ -171,7 +171,7 @@ index e27e2ec7d9..1011cecc73 100644
171171
T_pjlvalue, // env
172172
T_derived, // vals
173173
}, false);
174-
@@ -1458,7 +1458,7 @@ static const auto box_ssavalue_func = new JuliaFunction<TypeFnContextAndSizeT>{
174+
@@ -1444,7 +1444,7 @@ static const auto box_ssavalue_func = new JuliaFunction<TypeFnContextAndSizeT>{
175175
};
176176
static const auto jlgetbuiltinfptr_func = new JuliaFunction<>{
177177
XSTR(jl_get_builtin_fptr),
@@ -180,7 +180,7 @@ index e27e2ec7d9..1011cecc73 100644
180180
{JuliaType::get_prjlvalue_ty(C)}, false); },
181181
nullptr,
182182
};
183-
@@ -1549,7 +1549,7 @@ static const auto julia_call = new JuliaFunction<>{
183+
@@ -1535,7 +1535,7 @@ static const auto julia_call = new JuliaFunction<>{
184184
[](LLVMContext &C) {
185185
auto T_prjlvalue = JuliaType::get_prjlvalue_ty(C);
186186
return FunctionType::get(T_prjlvalue,
@@ -189,7 +189,7 @@ index e27e2ec7d9..1011cecc73 100644
189189
T_prjlvalue}, // %f
190190
true); }, // %args
191191
get_attrs_basic,
192-
@@ -1562,7 +1562,7 @@ static const auto julia_call2 = new JuliaFunction<>{
192+
@@ -1548,7 +1548,7 @@ static const auto julia_call2 = new JuliaFunction<>{
193193
[](LLVMContext &C) {
194194
auto T_prjlvalue = JuliaType::get_prjlvalue_ty(C);
195195
return FunctionType::get(T_prjlvalue,
@@ -198,7 +198,7 @@ index e27e2ec7d9..1011cecc73 100644
198198
T_prjlvalue, // %arg1
199199
T_prjlvalue}, // %f
200200
true); }, // %args
201-
@@ -1576,7 +1576,7 @@ static const auto julia_call3 = new JuliaFunction<>{
201+
@@ -1562,7 +1562,7 @@ static const auto julia_call3 = new JuliaFunction<>{
202202
auto T_prjlvalue = JuliaType::get_prjlvalue_ty(C);
203203
Type *T = PointerType::get(JuliaType::get_jlvalue_ty(C), AddressSpace::Derived);
204204
return FunctionType::get(T_prjlvalue,
@@ -207,7 +207,7 @@ index e27e2ec7d9..1011cecc73 100644
207207
T}, // %f
208208
true); }, // %args
209209
get_attrs_basic,
210-
@@ -5549,7 +5549,7 @@ static jl_cgval_t emit_call_specfun_boxed(jl_codectx_t &ctx, jl_value_t *jlretty
210+
@@ -5534,7 +5534,7 @@ static jl_cgval_t emit_call_specfun_boxed(jl_codectx_t &ctx, jl_value_t *jlretty
211211
std::string namep("p");
212212
namep += specFunctionObject;
213213
GlobalVariable *GV = cast_or_null<GlobalVariable>(jl_Module->getNamedValue(namep));
@@ -216,7 +216,7 @@ index e27e2ec7d9..1011cecc73 100644
216216
if (GV == nullptr) {
217217
GV = new GlobalVariable(*jl_Module, pfunc, false,
218218
GlobalVariable::ExternalLinkage,
219-
@@ -8334,7 +8334,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
219+
@@ -8319,7 +8319,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
220220
if (props.union_bytes) {
221221
props.cc = jl_returninfo_t::Union;
222222
Type *AT = ArrayType::get(getInt8Ty(M->getContext()), props.union_bytes);
@@ -225,7 +225,7 @@ index e27e2ec7d9..1011cecc73 100644
225225
argnames.push_back("union_bytes_return");
226226
Type *pair[] = { T_prjlvalue, getInt8Ty(M->getContext()) };
227227
rt = StructType::get(M->getContext(), ArrayRef<Type*>(pair));
228-
@@ -8363,7 +8363,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
228+
@@ -8348,7 +8348,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
229229
props.union_align = props.union_minalign = julia_alignment(jlrettype);
230230
// sret is always passed from alloca
231231
assert(M);

‎julia-patches/2f50b280dc8e995ef67ad31a5f71adc4c270890d‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1b39b599d9057cc073486f99521a93f45fdc7693 Mon Sep 17 00:00:00 2001
1+
From 243665861478f19406709f6af417fed8858a256d Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Fri, 8 Nov 2024 21:02:11 +0000
44
Subject: [PATCH] 2f50b280dc8e995ef67ad31a5f71adc4c270890d
@@ -14,10 +14,10 @@ Subject: [PATCH] 2f50b280dc8e995ef67ad31a5f71adc4c270890d
1414
7 files changed, 30 insertions(+), 30 deletions(-)
1515

1616
diff --git a/src/codegen.cpp b/src/codegen.cpp
17-
index 3290be8d6f..475e1376d2 100644
17+
index 39b5770e11..8df985bd6d 100644
1818
--- a/src/codegen.cpp
1919
+++ b/src/codegen.cpp
20-
@@ -2376,7 +2376,7 @@ static GlobalVariable *get_pointer_to_constant(jl_codegen_params_t &emission_con
20+
@@ -2362,7 +2362,7 @@ static GlobalVariable *get_pointer_to_constant(jl_codegen_params_t &emission_con
2121
static AllocaInst *emit_static_alloca(jl_codectx_t &ctx, Type *lty, Align align)
2222
{
2323
++EmittedAllocas;

‎julia-patches/390300d9f41df6ad71f0f4196ef4885d4bd5dc48‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3fc32fb95733ee6cc5df780212ffeba6274c4d70 Mon Sep 17 00:00:00 2001
1+
From ad2b34c78ffe06e6351b5b311f9e93a5b1c4a270 Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Fri, 8 Nov 2024 21:33:31 +0000
44
Subject: [PATCH] 390300d9f41df6ad71f0f4196ef4885d4bd5dc48

‎julia-patches/52c338daece1ea5556865373c777bdad79a05fd8‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
From 82941079e3d04278e89bdee95cd40b826aef8994 Mon Sep 17 00:00:00 2001
2+
From: Zentrik <[email protected]>
3+
Date: Sat, 8 Feb 2025 18:50:22 +0000
4+
Subject: [PATCH] 52c338daece1ea5556865373c777bdad79a05fd8
5+
6+
---
7+
deps/csl.mk | 1 +
8+
1 file changed, 1 insertion(+)
9+
110
diff --git a/deps/csl.mk b/deps/csl.mk
211
index fef950aa41..240089372f 100644
312
--- a/deps/csl.mk
@@ -10,4 +19,6 @@ index fef950aa41..240089372f 100644
1019
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libgcc_s.a $(build_private_libdir)/
1120
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libgcc.a $(build_private_libdir)/
1221
cp -a $(build_libdir)/gcc/$(BB_TRIPLET)/$(GCC_VERSION)/libmsvcrt.a $(build_private_libdir)/
22+
--
23+
2.34.1
1324

‎julia-patches/9a258664024d12a06ba8eb9344e270a9bb5f5d87‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 635220c6bcdbd92a5171411862146d2361886636 Mon Sep 17 00:00:00 2001
1+
From e98e0b96bfd1dea6039babd5a47a7a0569b179f3 Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Fri, 8 Nov 2024 21:02:10 +0000
44
Subject: [PATCH] 9a258664024d12a06ba8eb9344e270a9bb5f5d87
@@ -8,7 +8,7 @@ Subject: [PATCH] 9a258664024d12a06ba8eb9344e270a9bb5f5d87
88
1 file changed, 6 insertions(+), 3 deletions(-)
99

1010
diff --git a/src/codegen.cpp b/src/codegen.cpp
11-
index 5507bd7bad..3290be8d6f 100644
11+
index 16cedabed1..39b5770e11 100644
1212
--- a/src/codegen.cpp
1313
+++ b/src/codegen.cpp
1414
@@ -76,6 +76,7 @@
@@ -19,7 +19,7 @@ index 5507bd7bad..3290be8d6f 100644
1919

2020
#ifdef USE_ITTAPI
2121
#include "ittapi/ittnotify.h"
22-
@@ -10600,15 +10601,17 @@ namespace llvm {
22+
@@ -10585,15 +10586,17 @@ namespace llvm {
2323
class MachineBasicBlock;
2424
class MachineFunction;
2525
raw_ostream& operator<<(raw_ostream &OS, const MachineBasicBlock &MBB);

‎julia-patches/b1aa0b0b88a0bca2553f8c6d6c52ec3b7205064b‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3d6f938055daa0318cd51a9797e669370bcc4b35 Mon Sep 17 00:00:00 2001
1+
From 8674a7f59e975de99d8ab801ecd70b090c3480f0 Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Fri, 8 Nov 2024 21:02:10 +0000
44
Subject: [PATCH] b1aa0b0b88a0bca2553f8c6d6c52ec3b7205064b

‎julia-patches/bb3f5e1fed7c6ba733b7f273e93f5d3930976185‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From df0c7d927c7f867edadf61845c769516cb717ca9 Mon Sep 17 00:00:00 2001
1+
From d794bc20557769f11fa1e9dc1992429ca4a62871 Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Sat, 16 Nov 2024 15:30:41 +0000
44
Subject: [PATCH] bb3f5e1fed7c6ba733b7f273e93f5d3930976185

‎julia-patches/dc11c0601577afb8f67513d041ee25dabe3555b9‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 20019f442530bee1f1c5a78b72cef010a8cd63f5 Mon Sep 17 00:00:00 2001
1+
From 8c43970aede1f780cf03dd728abd82ab52f4bf24 Mon Sep 17 00:00:00 2001
22
From: Zentrik <[email protected]>
33
Date: Mon, 11 Nov 2024 21:03:05 +0000
44
Subject: [PATCH] dc11c0601577afb8f67513d041ee25dabe3555b9

0 commit comments

Comments
 (0)