Rebase patches (#49)

Author: Zentrik

julia-patches/1b7b3b8d354a28f5fb1381c61c5663819d29a974

@@ -1,4 +1,4 @@
-From 0ecd905b06a59d851690b88ccc972fe3ed9fbd3f Mon Sep 17 00:00:00 2001
+From 1b7a90a8a167b127c0f48b6cb4a486caa12b7249 Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Fri, 8 Nov 2024 21:02:11 +0000
 Subject: [PATCH] 1b7b3b8d354a28f5fb1381c61c5663819d29a974
@@ -8,10 +8,10 @@ Subject: [PATCH] 1b7b3b8d354a28f5fb1381c61c5663819d29a974
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/ccall.cpp b/src/ccall.cpp
-index eb64adef44..263fbeef15 100644
+index 6c03f9532d..ce7806ae1e 100644
 --- a/src/ccall.cpp
 +++ b/src/ccall.cpp
-@@ -2093,7 +2093,7 @@ jl_cgval_t function_sig_t::emit_a_ccall(
+@@ -2095,7 +2095,7 @@ jl_cgval_t function_sig_t::emit_a_ccall(
              }
              else if (f_name.starts_with("llvm.")) {
                  // compute and verify auto-mangling for intrinsic name

julia-patches/29441e4f5fa5f5c7709f7cf180815ba97f611297

@@ -1,15 +1,15 @@
-From 7e2dc1fc3a5dc3385c15336af84be62989282324 Mon Sep 17 00:00:00 2001
+From 1b786a0511f3a23c59dde4637b0d41eca5af23e5 Mon Sep 17 00:00:00 2001
 From: Zentrik <[email protected]>
 Date: Tue, 4 Feb 2025 20:44:02 +0000
 Subject: [PATCH] 29441e4f5fa5f5c7709f7cf180815ba97f611297
 
 Adapt to removal of NoCapture
 ---
- src/codegen.cpp | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
+ src/codegen.cpp | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/src/codegen.cpp b/src/codegen.cpp
-index 3fe7093768..69022a6e5a 100644
+index 1011cecc73..c00f05edc9 100644
 --- a/src/codegen.cpp
 +++ b/src/codegen.cpp
 @@ -628,7 +628,7 @@ static AttributeList get_func_attrs(LLVMContext &C)
@@ -21,25 +21,7 @@ index 3fe7093768..69022a6e5a 100644
  }
 
  static AttributeList get_donotdelete_func_attrs(LLVMContext &C)
-@@ -995,7 +995,7 @@ static const auto jlinvoke_func = new JuliaFunction<>{
-             AttributeSet(),
-             Attributes(C, {Attribute::NonNull}),
-             {AttributeSet(),
--             Attributes(C, {Attribute::ReadOnly, Attribute::NoCapture})}); },
-+             Attributes(C, {Attribute::ReadOnly}, {Attribute::getWithCaptureInfo(C, CaptureInfo::none())})}); },
- };
- static const auto jlinvokeoc_func = new JuliaFunction<>{
-     XSTR(jl_invoke_oc),
-@@ -1004,7 +1004,7 @@ static const auto jlinvokeoc_func = new JuliaFunction<>{
-             AttributeSet(),
-             Attributes(C, {Attribute::NonNull}),
-             {AttributeSet(),
--             Attributes(C, {Attribute::ReadOnly, Attribute::NoCapture})}); },
-+             Attributes(C, {Attribute::ReadOnly}, {Attribute::getWithCaptureInfo(C, CaptureInfo::none())})}); },
- };
- static const auto jlopaque_closure_call_func = new JuliaFunction<>{
-     XSTR(jl_f_opaque_closure_call),
-@@ -1039,7 +1039,7 @@ static const auto jllockvalue_func = new JuliaFunction<>{
+@@ -1031,7 +1031,7 @@ static const auto jllockvalue_func = new JuliaFunction<>{
      [](LLVMContext &C) { return AttributeList::get(C,
              AttributeSet(),
              AttributeSet(),
@@ -48,7 +30,7 @@ index 3fe7093768..69022a6e5a 100644
  };
  static const auto jlunlockvalue_func = new JuliaFunction<>{
      XSTR(jl_unlock_value),
-@@ -1048,7 +1048,7 @@ static const auto jlunlockvalue_func = new JuliaFunction<>{
+@@ -1040,7 +1040,7 @@ static const auto jlunlockvalue_func = new JuliaFunction<>{
      [](LLVMContext &C) { return AttributeList::get(C,
              AttributeSet(),
              AttributeSet(),
@@ -57,7 +39,7 @@ index 3fe7093768..69022a6e5a 100644
  };
  static const auto jllockfield_func = new JuliaFunction<>{
      XSTR(jl_lock_field),
-@@ -1057,7 +1057,7 @@ static const auto jllockfield_func = new JuliaFunction<>{
+@@ -1049,7 +1049,7 @@ static const auto jllockfield_func = new JuliaFunction<>{
      [](LLVMContext &C) { return AttributeList::get(C,
              AttributeSet(),
              AttributeSet(),
@@ -66,7 +48,7 @@ index 3fe7093768..69022a6e5a 100644
  };
  static const auto jlunlockfield_func = new JuliaFunction<>{
      XSTR(jl_unlock_field),
-@@ -1066,7 +1066,7 @@ static const auto jlunlockfield_func = new JuliaFunction<>{
+@@ -1058,7 +1058,7 @@ static const auto jlunlockfield_func = new JuliaFunction<>{
      [](LLVMContext &C) { return AttributeList::get(C,
              AttributeSet(),
              AttributeSet(),
@@ -75,7 +57,7 @@ index 3fe7093768..69022a6e5a 100644
  };
  static const auto jlenter_func = new JuliaFunction<>{
      XSTR(jl_enter_handler),
-@@ -1529,7 +1529,7 @@ static const auto gc_loaded_func = new JuliaFunction<>{
+@@ -1528,7 +1528,7 @@ static const auto gc_loaded_func = new JuliaFunction<>{
          RetAttrs.addAttribute(Attribute::NonNull);
          RetAttrs.addAttribute(Attribute::NoUndef);
          return AttributeList::get(C, AttributeSet::get(C,FnAttrs), AttributeSet::get(C,RetAttrs),
@@ -84,41 +66,41 @@ index 3fe7093768..69022a6e5a 100644
                    Attributes(C, {Attribute::NonNull, Attribute::NoUndef, Attribute::ReadNone}) });
                    },
  };
-@@ -8223,7 +8223,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
-         AttrBuilder param(ctx.builder.getContext());
+@@ -8382,7 +8382,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
+         AttrBuilder param(M->getContext());
          param.addStructRetAttr(srt);
          param.addAttribute(Attribute::NoAlias);
 -        param.addAttribute(Attribute::NoCapture);
 +        param.addCapturesAttr(llvm::CaptureInfo::none());
          param.addAttribute(Attribute::NoUndef);
-         attrs.push_back(AttributeSet::get(ctx.builder.getContext(), param));
+         attrs.push_back(AttributeSet::get(M->getContext(), param));
          assert(fsig.size() == 1);
-@@ -8231,7 +8231,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
+@@ -8390,7 +8390,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
      if (props.cc == jl_returninfo_t::Union) {
-         AttrBuilder param(ctx.builder.getContext());
+         AttrBuilder param(M->getContext());
          param.addAttribute(Attribute::NoAlias);
 -        param.addAttribute(Attribute::NoCapture);
 +        param.addCapturesAttr(llvm::CaptureInfo::none());
          param.addAttribute(Attribute::NoUndef);
-         attrs.push_back(AttributeSet::get(ctx.builder.getContext(), param));
+         attrs.push_back(AttributeSet::get(M->getContext(), param));
          assert(fsig.size() == 1);
-@@ -8240,7 +8240,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
+@@ -8399,7 +8399,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
      if (props.return_roots) {
-         AttrBuilder param(ctx.builder.getContext());
+         AttrBuilder param(M->getContext());
          param.addAttribute(Attribute::NoAlias);
 -        param.addAttribute(Attribute::NoCapture);
 +        param.addCapturesAttr(llvm::CaptureInfo::none());
          param.addAttribute(Attribute::NoUndef);
-         attrs.push_back(AttributeSet::get(ctx.builder.getContext(), param));
-         fsig.push_back(ctx.types().T_ptr);
-@@ -8273,7 +8273,7 @@ static jl_returninfo_t get_specsig_function(jl_codectx_t &ctx, Module *M, Value
-         AttrBuilder param(ctx.builder.getContext());
+         attrs.push_back(AttributeSet::get(M->getContext(), param));
+         fsig.push_back(getPointerTy(M->getContext()));
+@@ -8432,7 +8432,7 @@ static jl_returninfo_t get_specsig_function(jl_codegen_params_t &params, Module
+         AttrBuilder param(M->getContext());
          Type *ty = et;
          if (et == nullptr || et->isAggregateType()) { // aggregate types are passed by pointer
 -            param.addAttribute(Attribute::NoCapture);
 +            param.addCapturesAttr(llvm::CaptureInfo::none());
              param.addAttribute(Attribute::ReadOnly);
-             ty = ctx.builder.getPtrTy(AddressSpace::Derived);
+             ty = PointerType::get(M->getContext(), AddressSpace::Derived);
          }
 -- 
 2.34.1