update builtins.jl and add some simple tests for using/import evaluation (#688)

Adjusts for JuliaLang/julia#57965.

Author: aviatesk

bin/generate_builtins.jl

@@ -23,6 +23,8 @@ const RECENTLY_ADDED = Core.Builtin[
     setglobalonce!,
     swapglobal!,
     Core._defaultctors,
+    Core._import,
+    Core._using,
     # Recently became builtins
     Base.invokelatest,
     Base.invoke_in_world,

src/builtins.jl

@@ -92,6 +92,8 @@ function maybe_evaluate_builtin(interp::Interpreter, frame::Frame, call_expr::Ex
         return Some{Any}(Core._equiv_typedef(getargs(interp, args, frame)...))
     elseif f === Core._expr
         return Some{Any}(Core._expr(getargs(interp, args, frame)...))
+    elseif @static isdefinedglobal(Core, :_import) && f === Core._import
+        return Some{Any}(Core._import(getargs(interp, args, frame)...))
     elseif f === Core._primitivetype
         return Some{Any}(Core._primitivetype(getargs(interp, args, frame)...))
     elseif f === Core._setsuper!
@@ -112,6 +114,8 @@ function maybe_evaluate_builtin(interp::Interpreter, frame::Frame, call_expr::Ex
         else
             return Some{Any}(Core._typevar(getargs(interp, args, frame)...))
         end
+    elseif @static isdefinedglobal(Core, :_using) && f === Core._using
+        return Some{Any}(Core._using(getargs(interp, args, frame)...))
     elseif f === Core.apply_type
         return Some{Any}(Core.apply_type(getargs(interp, args, frame)...))
     elseif f === Core.compilerbarrier

test/toplevel.jl

@@ -638,3 +638,14 @@ end
 let ex = :(const ___symbol___ = :___symbol___)
     @test JuliaInterpreter.finish_and_return!(Frame(@__MODULE__, ex), true) === :___symbol___
 end
+
+module UsingTest end
+module ImportTest end
+let ex = quote using Test end
+    JuliaInterpreter.finish_and_return!(Frame(UsingTest, ex), true)
+    @test @invokelatest JuliaInterpreter.isdefinedglobal(UsingTest, :Test)
+end
+let ex = quote import Test end
+    JuliaInterpreter.finish_and_return!(Frame(ImportTest, ex), true)
+    @test @invokelatest JuliaInterpreter.isdefinedglobal(ImportTest, :Test)
+end