[julia-git] fix extension loading

Author: yuyichao

alarmcn/julia-git/0001-Force-enable-GDB-debug-info-registration.patch

@@ -1,17 +1,18 @@
-From ae341f2350fffcbf88b799b4ab3c8c78e6cfc8d0 Mon Sep 17 00:00:00 2001
+From 1bc170a65756fa5d171d40589a3c1f6770ac09d7 Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Sat, 3 Oct 2020 08:45:51 -0400
 Subject: [PATCH 01/11] Force enable GDB debug info registration
 
+Actually force disabling it to work around LLVM 22 support bug
 ---
  src/codegen.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/codegen.cpp b/src/codegen.cpp
-index a83a900ee6..d4984b24e3 100644
+index 559d69e346..d91e926bd5 100644
 --- a/src/codegen.cpp
 +++ b/src/codegen.cpp
-@@ -10864,7 +10864,7 @@ extern "C" void jl_init_llvm(void)
+@@ -11046,7 +11046,7 @@ extern "C" void jl_init_llvm(void)
 
      bool jl_using_gdb_jitevents = false;
      // Register GDB event listener

alarmcn/julia-git/0002-Fix-source-file-paths.patch

@@ -1,4 +1,4 @@
-From aa7ac18cefa10e3ecd3452c2116128d0f41fc7d1 Mon Sep 17 00:00:00 2001
+From 04e823d469034c53a41ebc3c0e5fbab81b4a56bd Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Sun, 19 Jul 2020 09:40:32 -0400
 Subject: [PATCH 02/11] Fix source file paths

alarmcn/julia-git/0003-Clear-soname-and-hard-code-system-lib-path.patch

@@ -1,4 +1,4 @@
-From 910d6cdeae0944715474625d653d9ea7950fbf9d Mon Sep 17 00:00:00 2001
+From f846c0552d7f3e442fdf9ea254856363a4311c04 Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Tue, 22 Jun 2021 10:35:16 -0400
 Subject: [PATCH 03/11] Clear soname and hard code system lib path

alarmcn/julia-git/0004-Support-loading-extensions-from-STDLIB.patch

@@ -1,14 +1,14 @@
-From 943c1b35bae4ca6f23d8c9cb1b6054349815f472 Mon Sep 17 00:00:00 2001
+From 11f8c991d90507f9fa5f09ff2c7fad9ed59e48b3 Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Wed, 30 Aug 2023 09:28:03 -0400
 Subject: [PATCH 04/11] Support loading extensions from STDLIB
 
 ---
- base/loading.jl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 48 insertions(+)
+ base/loading.jl | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 51 insertions(+)
 
 diff --git a/base/loading.jl b/base/loading.jl
-index 10e3420015..cc91335fbe 100644
+index fec5c81f2d..9640830392 100644
 --- a/base/loading.jl
 +++ b/base/loading.jl
 @@ -1343,6 +1343,34 @@ end
@@ -46,7 +46,7 @@ index 10e3420015..cc91335fbe 100644
      path, project_file = entry_point_and_project_file(dir, pkg.name)
      if project_file === nothing
          pkg.uuid === nothing || return nothing
-@@ -1652,11 +1680,31 @@ const EXT_PRIMED = Dict{PkgId,Vector{PkgId}}() # Extension -> Parent + Triggers
+@@ -1701,11 +1729,34 @@ const EXT_PRIMED = Dict{PkgId,Vector{PkgId}}() # Extension -> Parent + Triggers
  const EXT_DORMITORY = Dict{PkgId,Vector{ExtensionId}}() # Trigger -> Extensions that can be triggered by it
  const EXT_DORMITORY_FAILED = ExtensionId[]
 
@@ -56,13 +56,16 @@ index 10e3420015..cc91335fbe 100644
 +        project_file = normpath(joinpath(pkgdir, proj))
 +        isfile_casesensitive(project_file) || continue
 +        entry = parsed_toml(project_file)
-+        weakdeps = get(entry, "weakdeps", nothing)::Union{Nothing, Vector{String}, Dict{String,Any}}
 +        extensions = get(entry, "extensions", nothing)::Union{Nothing, Dict{String, Any}}
-+        # Require STDLIB weakdeps to include the UUIDs
-+        if weakdeps isa Dict{String, Any} && extensions !== nothing
-+            _insert_extension_triggers(pkg, extensions, weakdeps)
-+            return true
++        if extensions === nothing
++            continue
 +        end
++        # Require STDLIB weakdeps to include the UUIDs
++        weakdeps = get(Dict{String, Any}, entry, "weakdeps")::Dict{String,Any}
++        deps = get(Dict{String, Any}, entry, "deps")::Dict{String,Any}
++        total_deps = merge(weakdeps, deps)
++        _insert_extension_triggers(pkg, extensions, total_deps)
++        return true
 +    end
 +    return false
 +end

alarmcn/julia-git/0005-julia-git-add-a-safeguard-for-bad-unwinding.patch

@@ -1,4 +1,4 @@
-From 787cdbc5a95d4aa3be2f25fcd50320d56b93a870 Mon Sep 17 00:00:00 2001
+From 27cfe539e2daf922ea93460a7f48ed0a6e73105c Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Tue, 3 Oct 2023 19:00:59 -0400
 Subject: [PATCH 05/11] [julia-git] add a safeguard for bad unwinding
@@ -8,7 +8,7 @@ Subject: [PATCH 05/11] [julia-git] add a safeguard for bad unwinding
  1 file changed, 2 insertions(+)
 
 diff --git a/src/stackwalk.c b/src/stackwalk.c
-index 79a15ecdd8..95520a7e82 100644
+index a0a0ad3274..9650d15bf4 100644
 --- a/src/stackwalk.c
 +++ b/src/stackwalk.c
 @@ -292,6 +292,8 @@ JL_DLLEXPORT jl_value_t *jl_backtrace_from_here(int returnsp, int skip)

alarmcn/julia-git/0006-Disable-UCX-signal-handler.patch

@@ -1,4 +1,4 @@
-From da01816272939e2538aa1b5c83629ea239736f2f Mon Sep 17 00:00:00 2001
+From 36fc6114bd42ac1440a526df646f27eeb3cb1d62 Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Mon, 26 May 2025 23:20:16 -0400
 Subject: [PATCH 06/11] Disable UCX signal handler

alarmcn/julia-git/0007-julia-git-Better-support-for-loading-packages-from-s.patch

@@ -1,4 +1,4 @@
-From bc66bbab3a454fbaff7239c3bd8517ebcf15891a Mon Sep 17 00:00:00 2001
+From d3eb64adb4038c86af3d2d60978801f4dc0a697c Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Fri, 15 Aug 2025 12:24:38 -0400
 Subject: [PATCH 07/11] [julia-git] Better support for loading packages from
@@ -9,7 +9,7 @@ Subject: [PATCH 07/11] [julia-git] Better support for loading packages from
  1 file changed, 4 insertions(+)
 
 diff --git a/base/loading.jl b/base/loading.jl
-index cc91335fbe..d343596b5f 100644
+index 9640830392..f9bc145d7c 100644
 --- a/base/loading.jl
 +++ b/base/loading.jl
 @@ -1313,6 +1313,10 @@ function explicit_manifest_entry_load_spec(manifest_file::String, pkg::PkgId, en

alarmcn/julia-git/0008-Reduce-likelyhood-of-symbol-conflict.patch

@@ -1,4 +1,4 @@
-From 9732371d453f8041ff55bfb76c94effadcce245c Mon Sep 17 00:00:00 2001
+From 862d6b958312908c7b9373a6cd2c6109beb12432 Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Sun, 24 Aug 2025 19:28:22 -0400
 Subject: [PATCH 08/11] Reduce likelyhood of symbol conflict

alarmcn/julia-git/0009-codegen-add-support-for-llvm-22.patch

@@ -1,4 +1,4 @@
-From d919ba7970703320ccfd2f41a81e14084bb74049 Mon Sep 17 00:00:00 2001
+From 2628dd59664b2768af344cd5f02afc484027f83d Mon Sep 17 00:00:00 2001
 From: Jameson Nash <vtjnash@gmail.com>
 Date: Wed, 29 Jul 2026 15:12:45 +0000
 Subject: [PATCH 09/11] codegen: add support for llvm-22
@@ -18,10 +18,10 @@ Subject: [PATCH 09/11] codegen: add support for llvm-22
  11 files changed, 95 insertions(+), 18 deletions(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 8292c7bbe2..15b21e35ad 100644
+index 7398a14da9..4d06db230e 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -765,16 +765,18 @@ SA_EXCEPTIONS-gc-stock.c                    := -Xanalyzer -analyzer-config -Xana
+@@ -767,16 +767,18 @@ SA_EXCEPTIONS-gc-stock.c                    := -Xanalyzer -analyzer-config -Xana
   # these need to be annotated (and possibly fixed)
  SKIP_GC_CHECK := codegen.cpp rtutils.c
 
@@ -101,10 +101,10 @@ index 2664fee69f..b9f01b2658 100644
    const MemRegion *R = LVal.getAsRegion();
    if (!R) {
 diff --git a/src/codegen.cpp b/src/codegen.cpp
-index d4984b24e3..ba339d0715 100644
+index d91e926bd5..d604d672ef 100644
 --- a/src/codegen.cpp
 +++ b/src/codegen.cpp
-@@ -10477,7 +10477,7 @@ jl_code_info_t *jl_get_method_ir(jl_code_instance_t *ci)
+@@ -10659,7 +10659,7 @@ jl_code_info_t *jl_get_method_ir(jl_code_instance_t *ci)
  void emit_always_inline(jl_codegen_output_t &out,
                          unique_function<jl_code_info_t *(jl_code_instance_t *)> get_src)
  {
@@ -152,7 +152,7 @@ index 26b95fdb16..f82a192367 100644
 
      MCContext Ctx(TheTriple, MAI.get(), MRI.get(), STI.get(), &SrcMgr);
 diff --git a/src/jitlayers.cpp b/src/jitlayers.cpp
-index dbf874ec79..07bee4f783 100644
+index a1c4556275..5f292a78b2 100644
 --- a/src/jitlayers.cpp
 +++ b/src/jitlayers.cpp
 @@ -14,7 +14,11 @@
@@ -167,7 +167,7 @@ index dbf874ec79..07bee4f783 100644
  #if JL_LLVM_VERSION >= 210000
  #  include <llvm/ExecutionEngine/Orc/SelfExecutorProcessControl.h>
  #endif
-@@ -2118,9 +2122,11 @@ void JuliaOJIT::enableJITDebuggingSupport()
+@@ -2125,9 +2129,11 @@ void JuliaOJIT::enableJITDebuggingSupport()
  {
      orc::SymbolMap GDBFunctions;
      addAbsoluteToMap(GDBFunctions,llvm_orc_registerJITLoaderGDBAllocAction);
@@ -180,7 +180,7 @@ index dbf874ec79..07bee4f783 100644
      if (TM->getTargetTriple().isOSBinFormatMachO()) {
          auto RegisterSym = cantFail(
              safelookup(ES, {&JD}, ES.intern("_llvm_orc_registerJITLoaderGDBAllocAction")));
-@@ -2129,8 +2135,22 @@ void JuliaOJIT::enableJITDebuggingSupport()
+@@ -2136,8 +2142,22 @@ void JuliaOJIT::enableJITDebuggingSupport()
      }
  #ifndef _COMPILER_ASAN_ENABLED_ // TODO: Fix duplicated sections spam #51794
      else if (TM->getTargetTriple().isOSBinFormatELF()) {
@@ -203,7 +203,7 @@ index dbf874ec79..07bee4f783 100644
      }
  #endif
  }
-@@ -2356,7 +2376,7 @@ bool JuliaOJIT::linkOutput(orc::MaterializationResponsibility &MR, MemoryBufferR
+@@ -2363,7 +2383,7 @@ bool JuliaOJIT::linkOutput(orc::MaterializationResponsibility &MR, MemoryBufferR
              continue;
          }
          JL_GC_PROMISE_ROOTED(CI);
@@ -213,10 +213,10 @@ index dbf874ec79..07bee4f783 100644
              return false;
          if (auto *DestSym = findLinkGraphSymbolByName(G, Dest);
 diff --git a/src/jitlayers.h b/src/jitlayers.h
-index 6b3de497a0..bb5a882bf3 100644
+index 47af9acda6..abb46a2132 100644
 --- a/src/jitlayers.h
 +++ b/src/jitlayers.h
-@@ -410,7 +410,10 @@ private:
+@@ -419,7 +419,10 @@ private:
 
  struct jl_linker_info_t {
      DenseMap<jl_code_instance_t *, jl_codeinst_funcs_t<orc::SymbolStringPtr>> ci_funcs;
@@ -228,7 +228,7 @@ index 6b3de497a0..bb5a882bf3 100644
          call_targets;
      DenseMap<void *, orc::SymbolStringPtr> global_targets;
  };
-@@ -456,7 +459,9 @@ public:
+@@ -465,7 +468,9 @@ public:
 
  public:
      // outputs
@@ -240,10 +240,10 @@ index 6b3de497a0..bb5a882bf3 100644
      DenseMap<jl_code_instance_t *, jl_llvm_functions_t> ci_funcs;
      SmallVector<std::pair<jl_code_instance_t *, GlobalVariable *>, 0> external_fns;
 diff --git a/src/julia_threads.h b/src/julia_threads.h
-index 605e1c73e3..48c571d0a3 100644
+index 24ec348c2d..6e2d48c9a2 100644
 --- a/src/julia_threads.h
 +++ b/src/julia_threads.h
-@@ -166,7 +166,7 @@ typedef struct _jl_tls_states_t {
+@@ -215,7 +215,7 @@ typedef struct _jl_tls_states_t {
      struct _jl_task_t *root_task;
      struct _jl_timing_block_t *timing_stack;
      // This is the location of our copy_stack
@@ -283,7 +283,7 @@ index a3f07f03e4..214def0c9e 100644
  #else
      CallInst::Create(pass.lifetime_start, {sz, ptr}, "", orig);
 diff --git a/src/llvm-late-gc-lowering.cpp b/src/llvm-late-gc-lowering.cpp
-index 309916001d..30a3bbbb40 100644
+index c9a75759de..690cb08509 100644
 --- a/src/llvm-late-gc-lowering.cpp
 +++ b/src/llvm-late-gc-lowering.cpp
 @@ -182,8 +182,15 @@ static std::pair<Value*,int> FindBaseValue(const State &S, Value *V, bool UseCac

alarmcn/julia-git/0010-Fix-gcc_s-search.patch

@@ -1,4 +1,4 @@
-From 4fb3d3204bf0f9354f1eebcbb4573c32ea5993d5 Mon Sep 17 00:00:00 2001
+From 71c4f79be332fa771d96c868e0dfe6c0e4d24e66 Mon Sep 17 00:00:00 2001
 From: Yichao Yu <yyc1992@gmail.com>
 Date: Wed, 5 Aug 2026 00:49:20 -0400
 Subject: [PATCH 10/11] Fix gcc_s search