fix bootstrap signature of analyze_escapes

JuliaLang · Feb 3, 2022 · 6c740f8 · 6c740f8
1 parent 435c5f8
commit 6c740f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/base/compiler/bootstrap.jl b/base/compiler/bootstrap.jl
@@ -11,7 +11,7 @@ let
     world = get_world_counter()
     interp = NativeInterpreter(world)
 
-    analyze_escapes_tt = Tuple{typeof(analyze_escapes), IRCode, Int, Bool, typeof(code_cache(interp))}
+    analyze_escapes_tt = Tuple{typeof(analyze_escapes), IRCode, Int, Bool, typeof(getargescapes(code_cache(interp)))}
     fs = Any[
         # we first create caches for the optimizer, because they contain many loop constructions
         # and they're better to not run in interpreter even during bootstrapping

diff --git a/base/compiler/tfuncs.jl b/base/compiler/tfuncs.jl
@@ -1277,7 +1277,7 @@ function apply_type_nothrow(argtypes::Array{Any, 1}, @nospecialize(rt))
                 return false
             end
         elseif (isa(ai, Const) && isa(ai.val, Type)) || isconstType(ai)
-            ai = isa(ai, Const) ? ai.val : ai.parameters[1]
+            ai = isa(ai, Const) ? ai.val : (ai::DataType).parameters[1]
             if has_free_typevars(u.var.lb) || has_free_typevars(u.var.ub)
                 return false
             end