Merge pull request #3 from JuliaDebug/vc/preprocess

add preprocess function

Author: vchuravy

src/TypedCodeUtils.jl

@@ -52,6 +52,7 @@ canreflect(c::Callsite) = canreflect(c.callinfo)
 reflect(c::Callsite; optimize=true, params=current_params()) = reflect(c.callinfo, optimize=optimize, params=params)
 
 include("process.jl")
+include("preprocess.jl")
 
 ##
 # Utils

src/preprocess.jl

@@ -0,0 +1,24 @@
+if VERSION >= v"1.1.0-DEV.215"
+function dce!(ci, mi)
+    argtypes = Core.Compiler.matching_cache_argtypes(mi, nothing)[1]
+    ir = Compiler.inflate_ir(ci, sptypes_from_meth_instance(mi),
+                             argtypes)
+    compact = Core.Compiler.IncrementalCompact(ir, true)
+    # Just run through the iterator without any processing
+    Core.Compiler.foreach(x -> nothing, compact)
+    ir = Core.Compiler.finish(compact)
+    
+    Core.Compiler.replace_code_newstyle!(ci, ir, length(argtypes)-1)
+end
+else
+function dce!(ci, mi)
+end
+end
+
+function preprocess!(::Consumer, ref::Reflection, optimize)
+    if optimize
+        # if the optimizer hasn't run, the IR hasn't been converted
+        # to SSA form yet and dce is not legal
+        dce!(ref.CI, ref.mi)
+    end
+end

test/runtests.jl

@@ -18,16 +18,15 @@ f(x, y) = x + y
 
 # Cthulhu's inner loop
 function cthulhu(ref::Reflection)
-    callsites = Callsite[]
 
-    invokes      = filter((c)->lookthrough(identify_invoke,      c), ref.CI.code)
-    calls        = filter((c)->lookthrough(identify_call,        c), ref.CI.code)
+    invokes = filter((c)->lookthrough(identify_invoke,      c), ref.CI.code)
+    calls   = filter((c)->lookthrough(identify_call,        c), ref.CI.code)
 
     invokes = map((arg) -> process_invoke(DefaultConsumer(), ref, arg...), invokes)
-    append!(callsites, invokes)
-    calls = map((arg) -> process_call(DefaultConsumer(), ref, arg...), calls)
-    append!(callsites, calls)
-
+    calls   = map((arg) -> process_call(  DefaultConsumer(), ref, arg...), calls)
+    
+    callsites = append!(invokes, calls)
+    @show callsites
     sort!(callsites, by=(c)->c.id)
     return callsites
 end
@@ -50,3 +49,24 @@ ref = reflect(h, Tuple{Int}, params=params)
 calls = cthulhu(ref)
 nextrefs = collect(reflect(c) for c in calls if TypedCodeUtils.canreflect(c))
 
+if VERSION >= v"1.1.0-DEV.215" && Base.JLOptions().check_bounds == 0 
+Base.@propagate_inbounds function f(x)
+    @boundscheck error()
+end
+g(x) = @inbounds f(x)
+
+params = TypedCodeUtils.current_params()
+ref = reflect(g, Tuple{Vector{Float64}}, params=params)
+@show ref.CI.code
+calls = cthulhu(ref)
+@test !isempty(calls)
+
+TypedCodeUtils.preprocess!(DefaultConsumer(), ref, true)
+calls = cthulhu(ref)
+@test isempty(calls)
+
+end
+
+
+
+