From 0d27b0e76bcd2c50d6bd14ec98b8b9cd60e966f1 Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Thu, 8 Feb 2024 10:39:37 -0500
Subject: [PATCH 1/2] Adjust for upstream JuliaLang/julia#53088

---
 src/jlgen.jl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/jlgen.jl b/src/jlgen.jl
index 1a71ae2f..b0446bb2 100644
--- a/src/jlgen.jl
+++ b/src/jlgen.jl
@@ -268,6 +268,13 @@ Base.Experimental.@MethodTable(GLOBAL_METHOD_TABLE)
 
 ## interpreter
 
+@static if VERSION ≥ v"1.11.0-DEV.1498"
+    import Core.Compiler: get_inference_world
+    using Base: get_world_counter
+else
+    import Core.Compiler: get_world_counter, get_world_counter as get_inference_world
+end
+
 using Core.Compiler: OverlayMethodTable
 const MTType = Core.MethodTable
 if isdefined(Core.Compiler, :CachedMethodTable)
@@ -320,7 +327,7 @@ end
 
 CC.InferenceParams(interp::GPUInterpreter) = interp.inf_params
 CC.OptimizationParams(interp::GPUInterpreter) = interp.opt_params
-CC.get_world_counter(interp::GPUInterpreter) = interp.world
+#=CC.=#get_inference_world(interp::GPUInterpreter) = interp.world
 CC.get_inference_cache(interp::GPUInterpreter) = interp.inf_cache
 CC.code_cache(interp::GPUInterpreter) = WorldView(interp.code_cache, interp.world)
 
@@ -471,6 +478,7 @@ end
 # HACK: in older versions of Julia, `jl_create_native` doesn't take a world argument
 #       but instead always generates code for the current world. note that this doesn't
 #       actually change the world age, but just spoofs the counter `jl_create_native` reads.
+# XXX: Base.get_world_counter is supposed to be monotonically increasing and is runtime global.
 macro in_world(world, ex)
     quote
         actual_world = Base.get_world_counter()

From 31c6591f0d3004cf5c23b5e6cca9475dc18b5222 Mon Sep 17 00:00:00 2001
From: Valentin Churavy <v.churavy@gmail.com>
Date: Thu, 8 Feb 2024 13:08:21 -0500
Subject: [PATCH 2/2] Adjust for upstream JuliaLang/julia#52997

---
 src/jlgen.jl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/jlgen.jl b/src/jlgen.jl
index b0446bb2..e1a667b8 100644
--- a/src/jlgen.jl
+++ b/src/jlgen.jl
@@ -204,7 +204,11 @@ function (callback::CodeCacheCallback)(replaced::MethodInstance, max_world::UInt
     for ci in cis
         if ci.max_world == ~0 % Csize_t
             @assert ci.min_world - 1 <= max_world "attempting to set illogical constraints"
+@static if VERSION >= v"1.11.0-DEV.1390"
+            @atomic ci.max_world = max_world
+else
             ci.max_world = max_world
+end
         end
         @assert ci.max_world <= max_world
     end