Skip to content

Commit c13845b

Browse files
authored
Rebase patches (#63)
1 parent 4404b2d commit c13845b

15 files changed

+17
-1225
lines changed

julia-patches/1b7b3b8d354a28f5fb1381c61c5663819d29a974

Lines changed: 0 additions & 25 deletions
This file was deleted.

julia-patches/29441e4f5fa5f5c7709f7cf180815ba97f611297

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5ec1fdb70b7f4748de76b82a3d80f2df6b5f1fb4 Mon Sep 17 00:00:00 2001
1+
From 510f790eb0674f483269a021af66fada0d171e03 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,7 +9,7 @@ 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 8866dcf2f1..a32e91a379 100644
12+
index a752d09db5..57adbdb502 100644
1313
--- a/src/codegen.cpp
1414
+++ b/src/codegen.cpp
1515
@@ -614,7 +614,7 @@ static AttributeList get_func_attrs(LLVMContext &C)
@@ -21,7 +21,7 @@ index 8866dcf2f1..a32e91a379 100644
2121
}
2222

2323
static AttributeList get_donotdelete_func_attrs(LLVMContext &C)
24-
@@ -1017,7 +1017,7 @@ static const auto jllockvalue_func = new JuliaFunction<>{
24+
@@ -1016,7 +1016,7 @@ static const auto jllockvalue_func = new JuliaFunction<>{
2525
[](LLVMContext &C) { return AttributeList::get(C,
2626
AttributeSet(),
2727
AttributeSet(),
@@ -30,7 +30,7 @@ index 8866dcf2f1..a32e91a379 100644
3030
};
3131
static const auto jlunlockvalue_func = new JuliaFunction<>{
3232
XSTR(jl_unlock_value),
33-
@@ -1026,7 +1026,7 @@ static const auto jlunlockvalue_func = new JuliaFunction<>{
33+
@@ -1025,7 +1025,7 @@ static const auto jlunlockvalue_func = new JuliaFunction<>{
3434
[](LLVMContext &C) { return AttributeList::get(C,
3535
AttributeSet(),
3636
AttributeSet(),
@@ -39,7 +39,7 @@ index 8866dcf2f1..a32e91a379 100644
3939
};
4040
static const auto jllockfield_func = new JuliaFunction<>{
4141
XSTR(jl_lock_field),
42-
@@ -1035,7 +1035,7 @@ static const auto jllockfield_func = new JuliaFunction<>{
42+
@@ -1034,7 +1034,7 @@ static const auto jllockfield_func = new JuliaFunction<>{
4343
[](LLVMContext &C) { return AttributeList::get(C,
4444
AttributeSet(),
4545
AttributeSet(),
@@ -48,7 +48,7 @@ index 8866dcf2f1..a32e91a379 100644
4848
};
4949
static const auto jlunlockfield_func = new JuliaFunction<>{
5050
XSTR(jl_unlock_field),
51-
@@ -1044,7 +1044,7 @@ static const auto jlunlockfield_func = new JuliaFunction<>{
51+
@@ -1043,7 +1043,7 @@ static const auto jlunlockfield_func = new JuliaFunction<>{
5252
[](LLVMContext &C) { return AttributeList::get(C,
5353
AttributeSet(),
5454
AttributeSet(),
@@ -57,7 +57,7 @@ index 8866dcf2f1..a32e91a379 100644
5757
};
5858
static const auto jlenter_func = new JuliaFunction<>{
5959
XSTR(jl_enter_handler),
60-
@@ -1503,7 +1503,7 @@ static const auto gc_loaded_func = new JuliaFunction<>{
60+
@@ -1501,7 +1501,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 8866dcf2f1..a32e91a379 100644
6666
Attributes(C, {Attribute::NonNull, Attribute::NoUndef, Attribute::ReadNone}) });
6767
},
6868
};
69-
@@ -8207,7 +8207,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
69+
@@ -7940,7 +7940,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 8866dcf2f1..a32e91a379 100644
7575
param.addAttribute(Attribute::NoUndef);
7676
attrs.push_back(AttributeSet::get(M->getContext(), param));
7777
assert(fsig.size() == 1);
78-
@@ -8215,7 +8215,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
78+
@@ -7948,7 +7948,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 8866dcf2f1..a32e91a379 100644
8484
param.addAttribute(Attribute::NoUndef);
8585
attrs.push_back(AttributeSet::get(M->getContext(), param));
8686
assert(fsig.size() == 1);
87-
@@ -8224,7 +8224,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
87+
@@ -7957,7 +7957,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 8866dcf2f1..a32e91a379 100644
9393
param.addAttribute(Attribute::NoUndef);
9494
attrs.push_back(AttributeSet::get(M->getContext(), param));
9595
fsig.push_back(getPointerTy(M->getContext()));
96-
@@ -8257,7 +8257,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
96+
@@ -7990,7 +7990,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

0 commit comments

Comments
 (0)