Move some functions to CfgTools

src/common/framework/cfgTools.ml

@@ -620,6 +620,12 @@ let getCFG (file: file) : cfg * cfg * stmt list CfgEdgeH.t =
   if get_bool "justcfg" then fprint_hash_dot cfgB;
   (fun n -> H.find_default cfgF n []), (fun n -> H.find_default cfgB n []), skippedByEdge
 
+let compute_cfg_skips file =
+  let cfgF, cfgB, skippedByEdge = getCFG file in
+  (module struct let prev = cfgB let next = cfgF end : CfgBidir), skippedByEdge
+
+let compute_cfg file = fst (compute_cfg_skips file)
+
 
 let iter_fd_edges (module Cfg : CfgBackward) fd =
   let ready      = NH.create 113 in

src/framework/control.ml

@@ -811,15 +811,9 @@ let rec analyze_loop (module CFG : CfgBidir) file fs change_info skippedByEdge =
     (* TODO: do some more incremental refinement and reuse parts of solution *)
     analyze_loop (module CFG) file fs change_info skippedByEdge
 
-let compute_cfg_skips file =
-  let cfgF, cfgB, skippedByEdge = CfgTools.getCFG file in
-  (module struct let prev = cfgB let next = cfgF end : CfgBidir), skippedByEdge
-
-let compute_cfg = fst % compute_cfg_skips
-
 (** The main function to perform the selected analyses. *)
 let analyze change_info (file: file) fs =
   if (get_bool "dbg.verbose") then print_endline "Generating the control flow graph.";
-  let (module CFG), skippedByEdge = compute_cfg_skips file in
+  let (module CFG), skippedByEdge = CfgTools.compute_cfg_skips file in
   MyCFG.current_cfg := (module CFG);
   analyze_loop (module CFG) file fs change_info skippedByEdge