Don't use safepoint_on_entry cgparam on 1.9-beta1 and up. (#381)

JuliaGPU · Dec 28, 2022 · d1a400a · d1a400a
1 parent 3a36c99
commit d1a400a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/jlgen.jl b/src/jlgen.jl
@@ -379,7 +379,7 @@ function compile_method_instance(@nospecialize(job::CompilerJob),
         gnu_pubnames       = false,
         debug_info_kind    = Cint(debug_info_kind),
         lookup             = Base.unsafe_convert(Ptr{Nothing}, lookup_cb))
-    @static if VERSION >= v"1.9.0-DEV.1660"
+    @static if v"1.9.0-DEV.1660" <= VERSION < v"1.9.0-beta1" || VERSION >= v"1.10-"
         cgparams = merge(cgparams, (;safepoint_on_entry = can_safepoint(job)))
     end
     params = Base.CodegenParams(;cgparams...)

diff --git a/test/native.jl b/test/native.jl
@@ -196,7 +196,7 @@ end
     ir = sprint(io->native_code_llvm(io, identity, Tuple{Nothing}; entry_safepoint=false, optimize=false, dump_module=true))
     @test !occursin("%safepoint", ir)
 
-    @static if VERSION >= v"1.9.0-DEV.1660"
+    if v"1.9.0-DEV.1660" <= VERSION < v"1.9.0-alpha1.57" || VERSION >= v"1.10-"
         ir = sprint(io->native_code_llvm(io, identity, Tuple{Nothing}; entry_safepoint=true, optimize=false, dump_module=true))
         @test occursin("%safepoint", ir)
     end