Skip to content

Fix destructuring signature() return value before nothing check #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xal-0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix destructuring signature() return value before nothing check #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/signatures.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,8 +446,9 @@ function get_running_name(interp::Interpreter, frame::Frame, pc::Int, name::Glob
pctop -= 1
stmt = pc_expr(frame, pctop)
end # end fix
(mt, sigtparent), lastpcparent = signature(interp, frame, pctop)
sigtparent === nothing && return name, pc, lastpcparent
methinfo, lastpcparent = signature(interp, frame, pctop)
methinfo === nothing && return name, pc, lastpcparent
mt, sigtparent = methinfo
methparent = whichtt(sigtparent, mt)
methparent === nothing && return name, pc, lastpcparent # caller isn't defined, no correction is needed
if isgen
Expand Down Expand Up @@ -598,7 +599,7 @@ function methoddef!(interp::Interpreter, signatures::Vector{MethodInfoKey}, fram
end
found || return nothing
while true # methods containing inner methods may need multiple trips through this loop
(mt, sigt), pc = signature(interp, frame, stmt, pc)
methinfo, pc = signature(interp, frame, stmt, pc)
stmt = pc_expr(frame, pc)
while !isexpr(stmt, :method, 3)
pc = next_or_nothing(interp, frame, pc) # this should not check define, we've probably already done this once
Expand All @@ -608,7 +609,8 @@ function methoddef!(interp::Interpreter, signatures::Vector{MethodInfoKey}, fram
pc3 = pc
stmt = stmt::Expr
name3 = normalize_defsig(stmt.args[1], frame)
sigt === nothing && (error("expected a signature"); return next_or_nothing(interp, frame, pc)), pc3
methinfo === nothing && (error("expected a signature"); return next_or_nothing(interp, frame, pc)), pc3
mt, sigt = methinfo
# Methods like f(x::Ref{<:Real}) that use gensymmed typevars will not have the *exact*
# signature of the active method. So let's get the active signature.
frame.pc = pc
Expand Down
Loading