Skip to content
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

Jump to bottom

I heard you like inferring types but don't like global state... #21677

Merged
merged 21 commits into from
May 15, 2017
Merged

I heard you like inferring types but don't like global state... #21677

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
616e8bd
first steps towards recursive type inference
jrevels Feb 15, 2017
8335504
fill in mocked implementation of cyclic frame retrieval + intermediat…
jrevels Apr 20, 2017
41d5d4f
remove dead code
jrevels Apr 27, 2017
d789442
fix add_backedge
jrevels Apr 27, 2017
0089f54
remove unused global_sv
jrevels Apr 27, 2017
d070885
reimplement typeinf in the new recursive world
jrevels Apr 27, 2017
c597eaf
clean up old variable usage
jrevels Apr 27, 2017
eeca667
add back in age convergence logic
jrevels Apr 27, 2017
60b13fa
fix those nasty nasty bugs
jrevels Apr 27, 2017
0bc7fe1
correction to merge_call_chain algo (missing initial edge that makes …
vtjnash Apr 27, 2017
cd6f29f
this is necessary
vtjnash Apr 27, 2017
cf8e7d1
callers --> callers_in_cycle
jrevels Apr 27, 2017
4ef1176
restore heuristic limiting
vtjnash Apr 27, 2017
b59c578
in_egal --> contains_is
jrevels May 2, 2017
e02e6be
remove test checking the state of the now-nonexistant inference work …
jrevels May 3, 2017
71bfe2a
update inInference flag usage, enable infering inference
vtjnash May 8, 2017
258f71c
inference: de-thread parent parameter
vtjnash May 8, 2017
b886f76
ensure cycle-detection looks at the whole cycle set
vtjnash May 9, 2017
9363004
remove global state section
jrevels May 13, 2017
7633148
add explanation of resolve_call_cycle function
jrevels May 13, 2017
bc90761
fix typos and comment length
jrevels May 13, 2017
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
Prev Previous commit
Next Next commit
remove unused global_sv
  • Loading branch information
@jrevels @vtjnash
jrevels authored and vtjnash committed May 9, 2017
commit 0089f54500b7d7abd4202d55ec81467649e35f76
6 changes: 0 additions & 6 deletions base/inference.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2526,9 +2526,6 @@ end
#### do the work of inference ####

function typeinf_work(frame::InferenceState)
global global_sv # TODO: actually pass this to all functions that need it
last_global_sv = global_sv
global_sv = frame
@assert !frame.inferred
W = frame.ip
s = frame.stmt_types
Expand Down Expand Up @@ -2673,8 +2670,6 @@ function typeinf_work(frame::InferenceState)
end
end

global_sv = nothing

function typeinf(frame::InferenceState)
while have_next_callee(frame)
typeinf_work(frame)
Expand All @@ -2689,7 +2684,6 @@ function typeinf(frame::InferenceState)
finish(frame)
finalize_backedges(frame)
end
global_sv = last_global_sv
nothing
end

Expand Down