Skip to content

Commit 613abfd

Browse files
JeffBezansontopolarity
authored andcommitted
some fixes
1 parent 46abac8 commit 613abfd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Compiler/src/typeinfer.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@ function compileable_specialization_for_call(interp::AbstractInterpreter, @nospe
12311231
compileable_atype = get_compileable_sig(match.method, match.spec_types, match.sparams)
12321232
compileable_atype === nothing && return nothing
12331233
if match.spec_types !== compileable_atype
1234-
sp_ = ccall(:jl_type_intersection_with_env, Any, (Any, Any), compileable_atype, method.sig)::SimpleVector
1234+
sp_ = ccall(:jl_type_intersection_with_env, Any, (Any, Any), compileable_atype, match.method.sig)::SimpleVector
12351235
sparams = sp_[2]::SimpleVector
12361236
mi = specialize_method(match.method, compileable_atype, sparams)
12371237
else

Compiler/src/verifytrim.jl

+3-3
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
@@ -216,8 +216,8 @@ function verify_codeinstance!(codeinst::CodeInstance, codeinfo::CodeInfo, inspec
216216
end
217217
elseif Core.finalizer isa ftyp
218218
if length(stmt.args) == 3
219-
finalizer = argextype(stmt.args[2], ci, sptypes)
220-
obj = argextype(stmt.args[3], ci, sptypes)
219+
finalizer = argextype(stmt.args[2], codeinfo, sptypes)
220+
obj = argextype(stmt.args[3], codeinfo, sptypes)
221221
atype = argtypes_to_type(Any[finalizer, obj])
222222

223223
mi = compileable_specialization_for_call(interp, atype)

0 commit comments

Comments
 (0)