Skip to content

Commit 7b3e664

Browse files
committed
fix bootstrap signature of analyze_escapes
1 parent 9414031 commit 7b3e664

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

base/compiler/bootstrap.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let
1111
world = get_world_counter()
1212
interp = NativeInterpreter(world)
1313

14-
analyze_escapes_tt = Tuple{typeof(analyze_escapes), IRCode, Int, Bool, typeof(code_cache(interp))}
14+
analyze_escapes_tt = Tuple{typeof(analyze_escapes), IRCode, Int, Bool, typeof(getargescapes(code_cache(interp)))}
1515
fs = Any[
1616
# we first create caches for the optimizer, because they contain many loop constructions
1717
# and they're better to not run in interpreter even during bootstrapping

base/compiler/tfuncs.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@ function apply_type_nothrow(argtypes::Array{Any, 1}, @nospecialize(rt))
12771277
return false
12781278
end
12791279
elseif (isa(ai, Const) && isa(ai.val, Type)) || isconstType(ai)
1280-
ai = isa(ai, Const) ? ai.val : ai.parameters[1]
1280+
ai = isa(ai, Const) ? ai.val : (ai::DataType).parameters[1]
12811281
if has_free_typevars(u.var.lb) || has_free_typevars(u.var.ub)
12821282
return false
12831283
end

0 commit comments

Comments
 (0)