Merge pull request #13 from goblint/reanalyze-dce

Run dead code analysis with reanalyze

Author: michael-schwarz

src/DTreeView.re

@@ -26,6 +26,7 @@ type func = Func.t
 
 type t = File of file | Func of func
 
-let file ~path ?contents () = File (File.make ~path ?contents ())
+let file ~path ?contents () = File (File.make ~path ?contents ()) (* TODO: contents argument never used *)
 
+(* TODO: unused *)
 let func ~name ~file ?dot () = Func (Func.make ~name ~file ?dot ())

src/Menu.re

@@ -171,7 +171,7 @@ let unmarshal spec cil =
   let (module G : Sig) =
     (module Make (Cfg) (Spec)
               (struct
-                let increment = Analyses.empty_increment_data cil
+                let increment = Analyses.empty_increment_data ()
               end))
   in
   G.wrap_solver_state ()

src/bindings/dOMParser.ml

@@ -1,12 +1,6 @@
 module Line = struct
   type t = string * int
 
-  let empty = ("", -1)
-
-  let make file num = (file, num)
-
-  let valid (_, n) = n != -1
-
   let of_location (loc : Cil.location) = (loc.file, loc.line)
 end
 
@@ -22,6 +16,4 @@ type t = Line of line | Node of node
 
 let line file num = Line (file, num)
 
-let line_num = function Line ((_, n) as line) when Line.valid line -> Some n | _ -> None
-
 let node id = Node id

src/bindings/dOMParser.mli

@@ -19,6 +19,7 @@ end
 
 type t = Message.t list
 
+(* TODO: unused *)
 let filter_by_line (file, line) =
   let pred msg =
     match Message.location msg with

src/state/gvDisplay.ml

@@ -6,7 +6,7 @@ module Query = struct
   type error = ParseError of string
 
   let create ?(kind = CodeQuery.Var_k) ?(target = CodeQuery.Name_t "") ?(find = CodeQuery.Uses_f)
-      ?(structure = CodeQuery.None_s) ?(limitation = CodeQuery.None_c) ?(expression = "")
+      ?(structure = CodeQuery.None_s) ?(limitation = CodeQuery.None_c) ?(expression = "") (* TODO: limitation argument never used *)
       ?(mode = `Must) () : t =
     { kind; target; find; structure; limitation; expression; mode }
 
@@ -30,7 +30,7 @@ module Query = struct
   let execute (q : t) cil =
     if is_semantic q then (
       ExpressionEvaluation.gv_query := Some q;
-      Maingoblint.do_analyze (Analyses.empty_increment_data cil) cil;
+      Maingoblint.do_analyze (Analyses.empty_increment_data ()) cil;
       let results = !ExpressionEvaluation.gv_results in
       let pred =
         if q.mode = `Must then snd %> Option.default false else snd %> Option.default true