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.

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

Bugfix: functional() throws error for a break statement #130

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions src/passes/passes.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ function usecounts(ir::IR)
end

function dominators(cfg; entry = 1)
blocks = reachable_blocks(cfg, entry)
preds = cfg'
for i in 1:length(cfg.graph)
preds.graph[i] = filter(a -> a in blocks, preds[i])
end
blocks = [1:length(cfg.graph);]
doms = Dict(b => Set(blocks) for b in blocks)
while !isempty(blocks)
Expand All @@ -72,8 +76,9 @@ function dominators(cfg; entry = 1)
end

function domtree(cfg::CFG; entry = 1)
blocks = sort(reachable_blocks(cfg, entry))
doms = dominators(cfg, entry = entry)
doms = Dict(b => filter(c -> b != c && b in doms[c], 1:length(cfg)) for b in 1:length(cfg))
doms = Dict(b => filter(c -> b != c && b in doms[c], blocks) for b in blocks)
children(b) = filter(c -> !(c in union(map(c -> doms[c], doms[b])...)), doms[b])
tree(b) = Pair{Int,Any}(b,tree.(children(b)))
tree(entry)
Expand Down Expand Up @@ -308,10 +313,10 @@ function ssa!(ir::IR)
return ir
end

function reachable_blocks(cfg::CFG)
function reachable_blocks(cfg::CFG, entry = 1)
bs = Int[]
reaches(b) = b in bs || (push!(bs, b); reaches.(cfg[b]))
reaches(1)
reaches(entry)
return bs
end

Expand Down
23 changes: 23 additions & 0 deletions test/compiler.jl
Original file line number Diff line number Diff line change
Expand Up @@ -377,3 +377,26 @@ end
@test fir(nothing, 1.) == log(1. - log(2.))
@test fir(nothing, -1.) == 1.
end

@testset "functional" begin
relu(x) = (y = x > 0 ? x : 0)
ir = @code_ir relu(1)

@test_nowarn functional(ir)
end

@testset "while break" begin
function while_loop()
while true break end
end
tmp_ir = @code_ir(while_loop())
@test_nowarn functional(tmp_ir)

function while_loop2()
while true l == 0 && break end
end
tmp_ir = @code_ir(while_loop2())
@test_nowarn functional(tmp_ir)
end


Loading