diff --git a/src/JET.jl b/src/JET.jl index fc0b2e27a..8280e92bd 100644 --- a/src/JET.jl +++ b/src/JET.jl @@ -52,13 +52,10 @@ import .CC: inlining_policy # `ConcreteInterpreter` -import JuliaInterpreter: - #= interpreter.jl =# - evaluate_call_recurse!, handle_err, step_expr! +import JuliaInterpreter: evaluate_call_recurse!, handle_err, step_expr! # Test.jl integration -import Test: - record +import Test: record # usings # ====== @@ -80,15 +77,11 @@ using .CC: ⊑, istopfunction, may_invoke_generator, singleton_type, slot_id, specialize_method, switchtupleunion, tmerge, widenconst -using Base: - @invoke, @invokelatest, IdSet, default_tt, destructure_callex, parse_input_line, - rewrap_unionall, uniontypes, unwrap_unionall +using Base: IdSet -using Base.Meta: - ParseError, _parse_string, isexpr, lower +using Base.Meta: ParseError, _parse_string, isexpr, lower -using Base.Experimental: - @MethodTable, @overlay +using Base.Experimental: @MethodTable, @overlay using LoweredCodeUtils, JuliaInterpreter @@ -101,8 +94,7 @@ using JuliaInterpreter: @lookup, _INACTIVE_EXCEPTION, bypass_builtins, collect_args, #=finish!,=# is_quotenode_egal, is_return, maybe_evaluate_builtin, moduleof -using MacroTools: - @capture, MacroTools, normalise, striplines +using MacroTools: @capture, MacroTools, normalise, striplines using InteractiveUtils @@ -718,7 +710,7 @@ Finally returns the analysis result as [`JETCallResult`](@ref). Note that this is intended to be used by developers of `AbstractAnalyzer` only. General users should use high-level entry points like [`report_call`](@ref) and [`report_opt`](@ref). """ -function analyze_and_report_call!(analyzer::AbstractAnalyzer, @nospecialize(f), @nospecialize(types = default_tt(f)); +function analyze_and_report_call!(analyzer::AbstractAnalyzer, @nospecialize(f), @nospecialize(types = Base.default_tt(f)); jetconfigs...) tt = Base.signature_type(f, types) return analyze_and_report_call!(analyzer, tt::Type{<:Tuple}; jetconfigs...) diff --git a/src/analyzers/jetanalyzer.jl b/src/analyzers/jetanalyzer.jl index c69865076..c514c220c 100644 --- a/src/analyzers/jetanalyzer.jl +++ b/src/analyzers/jetanalyzer.jl @@ -1346,7 +1346,7 @@ function report_fieldaccess!(analyzer::JETAnalyzer, sv::InferenceState, @nospeci end isa(name, Const) || return false - s = unwrap_unionall(s00) + s = Base.unwrap_unionall(s00) if isType(s) if f === fieldtype # XXX this is a hack to share more code between `getfield`/`setfield!`/`fieldtype` diff --git a/src/toplevel/virtualprocess.jl b/src/toplevel/virtualprocess.jl index 1042ff6f7..321eb633e 100644 --- a/src/toplevel/virtualprocess.jl +++ b/src/toplevel/virtualprocess.jl @@ -579,7 +579,7 @@ function _virtual_process!(res::VirtualProcessResult, push!(res.files_stack, filename) s = String(s)::String - toplevelex = parse_input_line(s; filename) + toplevelex = Base.parse_input_line(s; filename) if isexpr(toplevelex, (:error, :incomplete)) # if there's any syntax error, try to identify all the syntax error location diff --git a/test/self_check.jl b/test/self_check.jl index e6e868e51..54f3dce60 100644 --- a/test/self_check.jl +++ b/test/self_check.jl @@ -37,7 +37,7 @@ let target_modules = (JET,) f === JET.copy_report || f === JET.handle_sig! || f === JET._which || - f === JET.rewrap_unionall || + f === Base.rewrap_unionall || f === JET.nameof || false) return false