[Seedpool] refactor

Author: bongjunj

src/seedpool.ml

@@ -236,11 +236,19 @@ let rec clean_llm llctx wide llm =
     else None
   with _ -> if wide then clean_llm llctx false llm else None
 
+let is_in_slice node_tbl distmap line =
+  match !Config.coverage with
+  | Config.FuzzingMode.Sliced_cfg ->
+      int_of_string line
+      |> Coverage.node_of_addr node_tbl distmap
+      |> Option.is_some
+  | _ -> true
+
 let can_optimize seedfile node_tbl distmap =
   match
     Opt.run ~passes:!Config.optimizer_passes ~mtriple:!Config.mtriple seedfile
   with
-  | Error Non_zero_exit | Error Hang ->
+  | Error Non_zero_exit | Error Hang | Assert _ ->
       L.debug "%s cannot be optimized" seedfile;
       AUtil.name_opted_ver seedfile |> AUtil.clean;
       None
@@ -249,23 +257,10 @@ let can_optimize seedfile node_tbl distmap =
       AUtil.name_opted_ver seedfile |> AUtil.clean;
       if !Config.coverage = Config.FuzzingMode.All_edges then Some (seedfile, [])
       else None
-  | Assert _ ->
-      L.debug "Opt %s failed by Assertion Error" seedfile;
-      AUtil.name_opted_ver seedfile |> AUtil.clean;
-      None
   | Ok lines ->
       L.debug "%s can be optimized" seedfile;
       AUtil.name_opted_ver seedfile |> AUtil.clean;
-      let filter_func =
-        match !Config.coverage with
-        | Config.FuzzingMode.Sliced_cfg ->
-            fun line ->
-              int_of_string line
-              |> Coverage.node_of_addr node_tbl distmap
-              |> Option.is_some
-        | _ -> fun _ -> true
-      in
-      let lines = lines |> List.filter filter_func in
+      let lines = lines |> List.filter (is_in_slice node_tbl distmap) in
       Some (seedfile, lines)
 
 let push (seed : Seed.t) pool =