fix runtime cglobal builtin function implementation

This had failed to be updated for the LazyLibrary changes to codegen.

Author: vtjnash

src/runtime_intrinsics.c

@@ -652,15 +652,9 @@ JL_DLLEXPORT jl_value_t *jl_cglobal(jl_value_t *v, jl_value_t *ty)
         return v;
     }
 
-    char *f_lib = NULL;
+    jl_value_t *f_lib = NULL;
     if (jl_is_tuple(v) && jl_nfields(v) > 1) {
-        jl_value_t *t1 = jl_fieldref(v, 1);
-        if (jl_is_symbol(t1))
-            f_lib = jl_symbol_name((jl_sym_t*)t1);
-        else if (jl_is_string(t1))
-            f_lib = jl_string_data(t1);
-        else
-            JL_TYPECHK(cglobal, symbol, t1)
+        f_lib = jl_fieldref(v, 1);
         v = jl_fieldref(v, 0);
     }
 
@@ -672,11 +666,15 @@ JL_DLLEXPORT jl_value_t *jl_cglobal(jl_value_t *v, jl_value_t *ty)
     else
         JL_TYPECHK(cglobal, symbol, v)
 
-    if (!f_lib)
-        f_lib = (char*)jl_dlfind(f_name);
-
     void *ptr;
-    jl_dlsym(jl_get_library(f_lib), f_name, &ptr, 1);
+    if (f_lib) {
+        ptr = jl_lazy_load_and_lookup(f_lib, f_name);
+    }
+    else {
+        void *handle = jl_get_library((char*)jl_dlfind(f_name));
+        jl_dlsym(handle, f_name, &ptr, 1);
+    }
+
     jl_value_t *jv = jl_gc_alloc(jl_current_task->ptls, sizeof(void*), rt);
     *(void**)jl_data_ptr(jv) = ptr;
     JL_GC_POP();

stdlib/Libdl/test/runtests.jl

@@ -266,7 +266,7 @@ mktempdir() do dir
 end
 
 ## Tests for LazyLibrary
-@testset "LazyLibrary" begin; mktempdir() do dir
+@testset "LazyLibrary" begin
     lclf_path = joinpath(private_libdir, "libccalllazyfoo.$(Libdl.dlext)")
     lclb_path = joinpath(private_libdir, "libccalllazybar.$(Libdl.dlext)")
 
@@ -294,21 +294,26 @@ end
         @test !any(contains.(dllist(), lclb_path))
     end
 
-    global libccalllazyfoo = LazyLibrary(lclf_path; on_load_callback=() -> global lclf_loaded = true)
-    global libccalllazybar = LazyLibrary(lclb_path; dependencies=[libccalllazyfoo], on_load_callback=() -> global lclb_loaded = true)
+    let libccalllazyfoo = LazyLibrary(lclf_path; on_load_callback=() -> global lclf_loaded = true),
+        libccalllazybar = LazyLibrary(lclb_path; dependencies=[libccalllazyfoo], on_load_callback=() -> global lclb_loaded = true)
+        eval(:(const libccalllazyfoo = $libccalllazyfoo))
+        eval(:(const libccalllazybar = $libccalllazybar))
+    end
+    Core.@latestworld
 
     # Creating `LazyLibrary` doesn't actually load anything
     @test !lclf_loaded
     @test !lclb_loaded
 
     # Explicitly calling `dlopen()` does:
-    dlopen(libccalllazybar)
+    h = dlopen(libccalllazybar)
     @test lclf_loaded
     @test lclb_loaded
     close_libs()
 
     # Test that the library gets loaded when you use `ccall()`
-    @test ccall((:bar, libccalllazybar), Cint, (Cint,), 2) == 6
+    compiled_bar() = ccall((:bar, libccalllazybar), Cint, (Cint,), 2)
+    @test ccall((:bar, libccalllazybar), Cint, (Cint,), 2) == compiled_bar() == 6
     @test lclf_loaded
     @test lclb_loaded
     close_libs()
@@ -324,11 +329,17 @@ end
     @test lclf_loaded
     close_libs()
 
+    # Test that `cglobal()` works, both compiled and runtime emulation
+    compiled_cglobal() = cglobal((:bar, libccalllazybar))
+    @test cglobal((:bar, libccalllazybar)) === compiled_cglobal() === dlsym(h, :bar)
+    @test lclf_loaded
+    close_libs()
+
     # Test that we can use lazily-evaluated library names:
     libname = LazyLibraryPath(private_libdir, "libccalllazyfoo.$(Libdl.dlext)")
     lazy_name_lazy_lib = LazyLibrary(libname)
     @test dlpath(lazy_name_lazy_lib) == realpath(string(libname))
-end; end
+end
 
 @testset "Docstrings" begin
     @test isempty(Docs.undocumented_names(Libdl))