More fix

Author: timholy

src/codeedges.jl

@@ -902,17 +902,6 @@ function add_control_flow!(isrequired, src, cfg, domtree, postdomtree)
                 # end
             end
         end
-        if !ok
-            print_with_code(stdout, src, isrequired)
-            @show ibb jbb ipbb
-            ipbb = postdomtree.idoms_bb[ibb]
-            print("ibb postdoms: ")
-            while ipbb != 0
-                print(ipbb, " ")
-                ipbb = postdomtree.idoms_bb[ipbb]
-            end
-            println()
-        end
         jbb <= length(blocks) && @assert ok
     end
     return changed
@@ -953,7 +942,7 @@ function add_typedefs!(isrequired, src::CodeInfo, edges::CodeEdges, (typedef_blo
         stmt = stmts[idx]
         isrequired[idx] == true || (idx += 1; continue)
         for (typedefr, typedefn) in zip(typedef_blocks, typedef_names)
-            if idx ∈ typedefr
+            if idx ∈ typedefr && !iscf(stmt)  # exclude control-flow nodes since they may be needed for other purposes
                 ireq = view(isrequired, typedefr)
                 if !all(==(true), ireq)
                     changed = true

test/codeedges.jl

@@ -219,10 +219,10 @@ module ModSelective end
     # Final block is not a `return`
     ex = quote
         x = 1
-        y = 7
+        yy = 7
         @label loop
         x += 1
-        x < 5 || return y
+        x < 5 || return yy
         @goto loop
     end
     frame = Frame(ModSelective, ex)
@@ -231,7 +231,7 @@ module ModSelective end
     isrequired = lines_required(GlobalRef(ModSelective, :x), src, edges)
     selective_eval_fromstart!(frame, isrequired, true)
     @test ModSelective.x == 5
-    @test !isdefined(ModSelective, :y)
+    @test !isdefined(ModSelective, :yy)
 
     # Control-flow in an abstract type definition
     ex = :(abstract type StructParent{T, N} <: AbstractArray{T, N} end)
@@ -326,7 +326,7 @@ module ModSelective end
         if iblock == length(bbs.blocks)
             @test any(idx->isrequired[idx]==true, r)
         else
-            @test !any(idx->isrequired[idx]==true, r)
+            @test !any(idx->isrequired[idx]==true && !LoweredCodeUtils.iscf(src.code[idx]), r)
         end
     end