Fixes for 1.13 and 1.14

[maleadt]

No description provided.

[github-actions]

Your PR requires formatting changes to meet the project's style guidelines.
Please consider running Runic (git runic master) to apply these changes.

Click here to view the suggested changes.

diff --git a/src/jlgen.jl b/src/jlgen.jl
index 29e54f5..b006220 100644
--- a/src/jlgen.jl
+++ b/src/jlgen.jl
@@ -135,7 +135,7 @@ function methodinstance_generator(world::UInt, source, self, ft::Type, tt::Type)
     # propagate edge metadata
     new_ci.min_world = min_world[]
     new_ci.max_world = max_world[]
-    new_ci.edges = Any[mi]
+        new_ci.edges = Any[mi]
 
     # prepare the slots
     new_ci.slotnames = Symbol[Symbol("#self#"), :ft, :tt]
@@ -627,14 +627,14 @@ function ci_cache_populate(interp, cache, mi, min_world, max_world)
 end
 
 @static if VERSION >= v"1.14-"
-function ci_cache_lookup(cache, mi, min_world, max_world)
-    # In Julia 1.14+, WorldView was replaced by InternalCodeCache with WorldRange
-    # cache is OverlayCodeCache{InternalCodeCache}, extract owner from globalcache
-    owner = cache.globalcache.owner
-    wvc = CC.InternalCodeCache(owner, CC.WorldRange(min_world, max_world))
-    ci = CC.get(wvc, mi, nothing)
-    return ci
-end
+    function ci_cache_lookup(cache, mi, min_world, max_world)
+        # In Julia 1.14+, WorldView was replaced by InternalCodeCache with WorldRange
+        # cache is OverlayCodeCache{InternalCodeCache}, extract owner from globalcache
+        owner = cache.globalcache.owner
+        wvc = CC.InternalCodeCache(owner, CC.WorldRange(min_world, max_world))
+        ci = CC.get(wvc, mi, nothing)
+        return ci
+    end
 else
 function ci_cache_lookup(cache, mi, min_world, max_world)
     wvc = WorldView(cache, min_world, max_world)
diff --git a/test/native.jl b/test/native.jl
index 9f908dc..33363a3 100644
--- a/test/native.jl
+++ b/test/native.jl
@@ -643,12 +643,12 @@ end
         end
 
         Base.Experimental.@MethodTable method_table
-        # @consistent_overlay (Julia 1.11+) is needed for the compiler to optimize through the overlay
-        @static if VERSION >= v"1.11-"
-            Base.Experimental.@consistent_overlay method_table @noinline Core.throw_inexacterror(f::Symbol, ::Type{T}, val) where {T} = return
-        else
-            Base.Experimental.@overlay method_table @noinline Core.throw_inexacterror(f::Symbol, ::Type{T}, val) where {T} = return
-        end
+    # @consistent_overlay (Julia 1.11+) is needed for the compiler to optimize through the overlay
+    @static if VERSION >= v"1.11-"
+        Base.Experimental.@consistent_overlay method_table @noinline Core.throw_inexacterror(f::Symbol, ::Type{T}, val) where {T} = return
+    else
+        Base.Experimental.@overlay method_table @noinline Core.throw_inexacterror(f::Symbol, ::Type{T}, val) where {T} = return
+    end
     end
 
     @test @filecheck begin

[codecov]

Codecov Report

❌ Patch coverage is 83.33333% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 75.30%. Comparing base (e2d8505) to head (0c01c14).
⚠️ Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
src/jlgen.jl	83.33%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #757      +/-   ##
==========================================
+ Coverage   74.75%   75.30%   +0.55%     
==========================================
  Files          24       24              
  Lines        3672     3677       +5     
==========================================
+ Hits         2745     2769      +24     
+ Misses        927      908      -19     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[christiangnrd]

FYI JuliaLang/julia#59413 was marked for backporting a few days ago so this will probably have to be adjusted once 1.13.0-beta2 is released.