Add option for manual restarting of globals

src/framework/varQuery.ml

@@ -4,3 +4,38 @@ type t =
 [@@deriving ord]
 
 type 'v f = 'v -> unit
+
+let varinfo_from_global (g : Cil.global) : Cil.varinfo option = match g with
+  | GFun (f, _) -> Some f.svar
+  | GVar (v, _, _) -> Some v
+  | GVarDecl (v, _) -> Some v
+  | _ -> None
+
+let varquery_from_global (g : Cil.global) : t option = match g with
+  | GFun (f, _) -> Some (Node {node = FunctionEntry f; fundec = Some f})
+  | GVar (v, _, _) -> Some (Global v)
+  | GVarDecl (v, _) -> Some (Global v)
+  | _ -> None
+
+(** Takes a [Cil.file] and a list of names of globals.contents
+    Returns a list of [VarQuery.t]s of globals whose [vname] is contained in the argument list,
+    and the list of names for which no global with the name could be found. *)
+let varqueries_from_names (file: Cil.file) (names: string list): t list * string list =
+  let module SM = Set.Make(Printable.Strings) in
+  let set = SM.of_list names in
+
+  (* Find list of [Cil.global]s that have one of the queried names, and a set of the found names *)
+  let globals, matched =
+    Cil.foldGlobals file (fun ((globs, matched) as acc) g ->
+        match varinfo_from_global g, varquery_from_global g with
+        | Some v, Some vq ->
+          begin match SM.mem v.vname set  with
+            | true -> (vq::globs, SM.add v.vname matched)
+            | _ -> acc
+          end
+        | None, None -> acc
+        | _, _ -> assert false
+      ) ([], SM.empty) in
+  (* List of queried but not found names *)
+  let unmatched = List.filter (fun s -> not @@ SM.mem s matched) names in
+  globals, unmatched

src/framework/varQuery.mli

@@ -0,0 +1,6 @@
+type t =
+    Global of Cil.varinfo
+  | Node of { node : Node.t; fundec : Cil.fundec option; }
+val compare : t -> t -> int
+type 'v f = 'v -> unit
+val varqueries_from_names : Cil.file -> string list -> t list * string list

src/maingoblint.ml

@@ -455,7 +455,7 @@ let diff_and_rename current_file =
         let max_ids = UpdateCil.update_ids old_file max_ids current_file version_map changes in
         let restarting = GobConfig.get_string_list "incremental.restart_globs.globs" in
 
-        let restarting, not_found = CilUtil.varquery_from_names current_file restarting in
+        let restarting, not_found = VarQuery.varqueries_from_names current_file restarting in
 
         if not (List.is_empty not_found) then begin
           List.iter