[Julia-1.12] World age fixes. Adapt to changes made for global module names.

Author: Keluaa

src/cleanup/julia_names.jl

@@ -63,6 +63,9 @@ Regex matching all global variable names which might change from one compilation
 !!! compat "Julia 1.11"
     Those global variables names only appear starting from Julia 1.11.
 
+!!! compat "Julia 1.12"
+    Those global variables may now start with `jl_` instead of `+`.
+
 In LLVM IR, those variables are mentioned as such: `@"+Core.GenericMemory#14067.jit"`.
 In native code, they look like this: `".L+Core.GenericMemory#13985.jit"`, with maybe some
 `.set` and `.size` sections at the end of the code (in x86 ASM).
@@ -79,8 +82,15 @@ in `julia_pgv(ctx, cname, addr)` at [`'src/cgutils.cpp#L358'`](https://github.co
 which is then added a `".jit"` suffix in [`'src/aotcompile.cpp#L2064'`](https://github.com/JuliaLang/julia/blob/08e1fc0abb959ce5bd4c75b05518a41b85e4aba1/src/aotcompile.cpp#L2064)
 when doing code introspection.
 """
-global_var_unique_gen_name_regex() = r"(\+[^\"\s,;\-']+)#\d+\.jit"
-global_var_unique_gen_name_regex(global_name) = Regex("(\\+\\Q$(global_name)\\E)#\\d+\\.jit")
+function global_var_unique_gen_name_regex end
+
+@static if VERSION < v"1.12-"
+    global_var_unique_gen_name_regex() = r"(\+[^\"\s,;\-']+)#\d+\.jit"
+    global_var_unique_gen_name_regex(global_name) = Regex("(\\+\\Q$(global_name)\\E)#\\d+\\.jit")
+else
+    global_var_unique_gen_name_regex() = r"((?:\+|jl_)[^\"\s,;\-']+)#\d+\.jit"
+    global_var_unique_gen_name_regex(global_name) = Regex("((?:\\+|jl_)\\Q$(global_name)\\E)#\\d+\\.jit")
+end
 
 
 """

src/get_code.jl

@@ -63,9 +63,9 @@ function code_native(
     else
         src = Base.Compiler.typeinf_code(Base.Compiler.NativeInterpreter(world), mi, true)
         if dump_module
-            f_str = InteractiveUtils._dump_function_native_assembly(mi, src, world, false, syntax, debuginfo, binary, raw, params)
+            f_str = InteractiveUtils._dump_function_native_assembly(mi, src, false, syntax, debuginfo, binary, raw, params)
         else
-            f_str = InteractiveUtils._dump_function_native_disassembly(mi, src, world, false, syntax, debuginfo, binary)
+            f_str = InteractiveUtils._dump_function_native_disassembly(mi, src, false, syntax, debuginfo, binary)
         end
     end
 
@@ -127,7 +127,7 @@ function code_llvm(
     else
         src = Base.Compiler.typeinf_code(Base.Compiler.NativeInterpreter(world), mi, true)
         f_str = InteractiveUtils._dump_function_llvm(
-            mi, src, world, false, !raw, dump_module, optimize, debuginfo, params
+            mi, src, false, !raw, dump_module, optimize, debuginfo, params
         )
     end
 

test/cleanup.jl

@@ -55,8 +55,14 @@ end
 
     # jlcapi_
     get_cfunc_add() = @cfunction(+, Int, (Int, Int))
-    @test occursin(r"jlcapi_\+_\d+", @io2str code_llvm(::IO, get_cfunc_add, Tuple{}))
-    @test CDC.replace_llvm_module_name("jlcapi_+_123") == "+"
+    if VERSION < v"1.12-"
+        @test occursin(r"jlcapi_\+_\d+", @io2str code_llvm(::IO, get_cfunc_add, Tuple{}))
+        @test CDC.replace_llvm_module_name("jlcapi_+_123") == "+"
+    else
+        # TODO: they changed how operator names work in 1.12? I don't know if this is fine or not...
+        @test occursin(r"jlcapi_#\+_\d+", @io2str code_llvm(::IO, get_cfunc_add, Tuple{}))
+        @test CDC.replace_llvm_module_name("jlcapi_#+_123") == "#+"
+    end
 
     # j_
     function test_append(a, b)
@@ -73,10 +79,16 @@ end
         @test CDC.replace_llvm_module_name("j_copyto!_123") == "copyto!"
 
         @test occursin(CDC.global_var_unique_gen_name_regex(), test_append_llvm_ir)
-        @test occursin(CDC.global_var_unique_gen_name_regex("Core.GenericMemory"), test_append_llvm_ir)
+
+        if VERSION ≥ v"1.12-"
+            @test occursin(CDC.global_var_unique_gen_name_regex("global"), test_append_llvm_ir)
+        else
+            @test occursin(CDC.global_var_unique_gen_name_regex("Core.GenericMemory"), test_append_llvm_ir)
+        end
 
         @test CDC.replace_llvm_module_name("@+Core.GenericMemory#123.jit") == "@+Core.GenericMemory.jit"
         @test CDC.replace_llvm_module_name(".L+Core.GenericMemory#123.jit") == ".L+Core.GenericMemory.jit"
+        @test CDC.replace_llvm_module_name(".L+Core.Array#123.jit") == ".L+Core.Array.jit"
     else
         @test occursin(CDC.function_unique_gen_name_regex(), test_append_llvm_ir)
         @test occursin(CDC.function_unique_gen_name_regex("_append!"), test_append_llvm_ir)