From cbc1922bc5cb50a5c4d5d5d954cf1ef19dac6b30 Mon Sep 17 00:00:00 2001 From: Keno Fischer Date: Tue, 18 Sep 2018 20:40:20 -0400 Subject: [PATCH] Disable CFG transforms for now CFG transforms can currently cause issues like #29107, but I'm still a few days away from fixing this properly. In the meantime, disable the transform. --- base/compiler/ssair/ir.jl | 2 +- test/inline.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/compiler/ssair/ir.jl b/base/compiler/ssair/ir.jl index 2f17f29c9db99..4741cbb30ac35 100644 --- a/base/compiler/ssair/ir.jl +++ b/base/compiler/ssair/ir.jl @@ -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) diff --git a/test/inline.jl b/test/inline.jl index c848975adff16..621e1cf6e47c9 100644 --- a/test/inline.jl +++ b/test/inline.jl @@ -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