Skip to content

Disable CFG transforms for now #29265

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

Merged
merged 1 commit into from
Sep 21, 2018
Merged

Disable CFG transforms for now #29265

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion base/compiler/ssair/ir.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ mutable struct IncrementalCompact
active_result_bb::Int
renamed_new_nodes::Bool
allow_cfg_transforms::Bool
function IncrementalCompact(code::IRCode, allow_cfg_transforms::Bool=true)
function IncrementalCompact(code::IRCode, allow_cfg_transforms::Bool=false)
# Sort by position with attach after nodes affter regular ones
perm = my_sortperm(Int[(code.new_nodes[i].pos*2 + Int(code.new_nodes[i].attach_after)) for i in 1:length(code.new_nodes)])
new_len = length(code.stmts) + length(code.new_nodes)
Expand Down
2 changes: 1 addition & 1 deletion test/inline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,4 @@ function f_ifelse(x)
return b ? x + 1 : x
end
# 2 for now because the compiler leaves a GotoNode around
@test length(code_typed(f_ifelse, (String,))[1][1].code) <= 2
@test_broken length(code_typed(f_ifelse, (String,))[1][1].code) <= 2