Skip to content

Commit 1722dc9

Browse files
JeffBezansontopolarity
authored andcommitted
some fixes
1 parent fc1113f commit 1722dc9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Compiler/src/typeinfer.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@ function compileable_specialization_for_call(interp::AbstractInterpreter, @nospe
12551255
compileable_atype = get_compileable_sig(match.method, match.spec_types, match.sparams)
12561256
compileable_atype === nothing && return nothing
12571257
if match.spec_types !== compileable_atype
1258-
sp_ = ccall(:jl_type_intersection_with_env, Any, (Any, Any), compileable_atype, method.sig)::SimpleVector
1258+
sp_ = ccall(:jl_type_intersection_with_env, Any, (Any, Any), compileable_atype, match.method.sig)::SimpleVector
12591259
sparams = sp_[2]::SimpleVector
12601260
mi = specialize_method(match.method, compileable_atype, sparams)
12611261
else

Compiler/src/verifytrim.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is a part of Julia. License is MIT: https://julialang.org/license
22

3-
import ..Compiler: verify_typeinf_trim
3+
import ..Compiler: verify_typeinf_trim, NativeInterpreter, argtypes_to_type, compileable_specialization_for_call
44

55
using ..Compiler:
66
# operators
@@ -221,8 +221,8 @@ function verify_codeinstance!(codeinst::CodeInstance, codeinfo::CodeInfo, inspec
221221
end
222222
elseif Core.finalizer isa ftyp
223223
if length(stmt.args) == 3
224-
finalizer = argextype(stmt.args[2], ci, sptypes)
225-
obj = argextype(stmt.args[3], ci, sptypes)
224+
finalizer = argextype(stmt.args[2], codeinfo, sptypes)
225+
obj = argextype(stmt.args[3], codeinfo, sptypes)
226226
atype = argtypes_to_type(Any[finalizer, obj])
227227

228228
mi = compileable_specialization_for_call(interp, atype)

0 commit comments

Comments
 (0)