Merge pull request #251 from JuliaDiff/kf/52998

Adjust to base compiler change

Author: oxinabox

src/codegen/reverse.jl

@@ -616,14 +616,14 @@ function diffract_ir!(ir, ci, meth, sparams::Core.SimpleVector, nargs::Int, N::I
                     end
                 end
                 tup = terminator_insert_node!(
-                    effect_free_and_nothrow(NewInstruction(Expr(:call, tuple, rev[orig_bb_ranges[active_bb]]...), Any, Int32(0))))
+                    removable_if_unused(NewInstruction(Expr(:call, tuple, rev[orig_bb_ranges[active_bb]]...), Any, Int32(0))))
                 for succ in succs
                     preds = cfg.blocks[succ].preds
                     if length(preds) == 1
                         val = tup
                     else
                         selector = findfirst(==(active_bb), preds)
-                        val = insert_node_here!(compact, effect_free_and_nothrow(NewInstruction(Expr(:call, tuple, selector, tup), Any, Int32(0))), true)
+                        val = insert_node_here!(compact, removable_if_unused(NewInstruction(Expr(:call, tuple, selector, tup), Any, Int32(0))), true)
                     end
                     pn = phi_nodes[succ]
                     push!(pn.edges, active_bb)

src/stage1/recurse.jl

@@ -4,9 +4,15 @@ using Core.Compiler:
     NoCallInfo, OldSSAValue, StmtRange,
     bbidxiter, cfg_delete_edge!, cfg_insert_edge!, compute_basic_blocks, complete,
     construct_domtree, construct_ssa!, domsort_ssa!, finish, insert_node!,
-    insert_node_here!, effect_free_and_nothrow, non_dce_finish!, quoted, retrieve_code_info,
+    insert_node_here!, non_dce_finish!, quoted, retrieve_code_info,
     scan_slot_def_use, userefs, SimpleInferenceLattice
 
+if VERSION < v"1.11.0-DEV.1351"
+    using Core.Compiler: effect_free_and_nothrow as removable_if_unused
+else
+    using Core.Compiler: removable_if_unused
+end
+
 using Base.Meta
 
 cname(nc, N, name) = Symbol(string("∂⃖", superscript(N), subscript(nc), name))