support rm code coverage effect

Author: Roger-luo

src/utils.jl

@@ -79,34 +79,62 @@ macro test_codeinfo(ci, ex)
     esc(test_codeinfo_m(ci, ex))
 end
 
+function rm_code_coverage_effect(ci::CodeInfo)
+    # make sure we don't change original one
+    new = NewCodeInfo(copy(ci))
+    for (v, stmt) in new
+        if Meta.isexpr(stmt, :code_coverage_effect)
+            delete!(new, v)
+        end
+    end
+    new_ci = finish(new)
+
+    if ci.ssavaluetypes isa Vector
+        types = []
+        for (v, stmt) in enumerate(ci.code)
+            if !Meta.isexpr(stmt, :code_coverage_effect)
+                push!(types, ci.ssavaluetypes[v])
+            end
+        end
+
+        new_ci.ssavaluetypes = types
+        new_ci.inferred = ci.inferred
+    end
+    return new_ci
+end
+
 function test_codeinfo_m(ci, ex::Expr)
     Meta.isexpr(ex, :block) || error("expect a begin ... end")
-    ret = Expr(:block)
+    @gensym nocodedov_ci
+
+    ret = quote
+        $nocodedov_ci = $CompilerPluginTools.rm_code_coverage_effect($ci)
+    end
     stmt_count = 1
     for each in ex.args
         @switch each begin
             @case :($stmt::$type)
                 push!(ret.args, quote
-                    @test $MLStyle.@match $ci.code[$stmt_count] begin
+                    @test $MLStyle.@match $nocodedov_ci.code[$stmt_count] begin
                         $stmt => true
                         _ => false
                     end
                 end)
                 push!(ret.args, quote
-                    @test $ci.ssavaluetypes[$stmt_count] == $type
+                    @test $nocodedov_ci.ssavaluetypes[$stmt_count] == $type
                 end)
                 stmt_count += 1
             @case ::LineNumberNode
                 continue
             @case _
                 push!(ret.args, quote
-                    @test $MLStyle.@match $ci.code[$stmt_count] begin
+                    @test $MLStyle.@match $nocodedov_ci.code[$stmt_count] begin
                         $each => true
                         _ => false
                     end
                 end)
                 stmt_count += 1
-        end        
+        end
     end
     return ret
 end

test/codeinfo.jl

@@ -127,3 +127,32 @@ end
         @test test_ci.code[9] == :(1 + $(SSAValue(8)))
     end
 end
+
+@testset "rm_code_coverage_effect" begin
+    ci = @make_codeinfo begin
+        #=%1 =# Expr(:code_coverage_effect)::Nothing
+        #=%2 =# QuoteNode(1.0)::Float64
+        #=%3 =# Expr(:call, sin, SSAValue(2))::Float64
+        #=%4 =# Expr(:code_coverage_effect)::Nothing
+        #=%5 =# QuoteNode(2.0)::Float64
+        #=%6 =# Expr(:call, sin, SSAValue(5))::Float64
+        #=%7 =# Expr(:code_coverage_effect)::Nothing
+        #=%8 =# Expr(:call, <, SSAValue(6), QuoteNode(1.0))::Bool
+        #=%9 =# GotoIfNot(SSAValue(8), 10)
+        #=%10=# Expr(:call, +, SSAValue(3), SSAValue(6))::Float64
+        #=%11=# ReturnNode(SSAValue(10))::Float64
+    end
+
+    test_ci = CompilerPluginTools.rm_code_coverage_effect(ci)
+
+    @test_codeinfo test_ci begin
+        #=%1=# QuoteNode(1.0)::Float64
+        #=%2=# Expr(:call, sin, SSAValue(1))::Float64
+        #=%3=# QuoteNode(2.0)::Float64
+        #=%4=# Expr(:call, sin, SSAValue(3))::Float64
+        #=%5=# Expr(:call, <, SSAValue(4), QuoteNode(1.0))::Bool
+        #=%6=# GotoIfNot(SSAValue(5), 7)
+        #=%7=# Expr(:call, +, SSAValue(2), SSAValue(4))::Float64
+        #=%8=# ReturnNode(SSAValue(7))::Float64     
+    end
+end