Merge branch 'fix/unused-field' into 'master'

[Eva] Removes unused record fields

See merge request frama-c/frama-c!3224

src/plugins/dive/context.ml

@@ -35,7 +35,6 @@ module Index = Datatype.Int.Hashtbl
 module NodeTable = FCHashtbl.Make (NodeRef)
 module NodeSet = Graph.Node.Set
 module BaseSet = Cil_datatype.Varinfo.Set
-module FunctionMap = Kernel_function.Map
 
 type t = {
   mutable graph: Graph.t;
@@ -43,7 +42,6 @@ type t = {
   mutable node_table: node NodeTable.t; (* node_kind * callstack -> node *)
   mutable unfolded_bases: BaseSet.t;
   mutable hidden_bases: BaseSet.t;
-  mutable focus: bool FunctionMap.t;
   mutable max_dep_fetch_count: int;
   mutable roots: NodeSet.t;
   mutable graph_diff: graph_diff;
@@ -60,7 +58,6 @@ let create () =
     node_table = NodeTable.create 13;
     unfolded_bases = BaseSet.empty;
     hidden_bases = BaseSet.empty;
-    focus = FunctionMap.empty;
     max_dep_fetch_count = 10;
     roots = NodeSet.empty;
     graph_diff = { last_root = None ; added_nodes=[] ; removed_nodes=[] };
@@ -70,7 +67,6 @@ let clear context =
   context.graph <- Graph.create ();
   context.vertex_table <- Index.create 13;
   context.node_table <- NodeTable.create 13;
-  context.focus <- FunctionMap.empty;
   context.max_dep_fetch_count <- 10;
   context.roots <- NodeSet.empty;
   context.graph_diff <- { last_root = None ; added_nodes=[] ; removed_nodes=[] }

src/plugins/value/gui_files/gui_red.ml

@@ -60,9 +60,6 @@ type red_alarm = {
   function_name:string;
   kind:string;
   acsl: string;
-  alarm_or_prop: Red_statuses.alarm_or_property;
-  (* Status here means 'final' status as emitted by all plugins. Currentlt not
-     shown. *)
   ip: Property.t;
   callstacks: int; (* Number of callstacks in which the red alarm occured. *)
 }
@@ -88,14 +85,12 @@ let make_red_alarm function_name ki alarm callstacks =
   let acsl =
     Format.asprintf "@[<hov>%a@]" Cil_datatype.Toplevel_predicate.pretty p
   in
-  let alarm_or_prop = Red_statuses.Alarm alarm in
-  { function_name; ip; kind; alarm_or_prop; acsl; callstacks }
+  { function_name; ip; kind; acsl; callstacks }
 
 let make_red_prop function_name ip callstacks =
   let kind = "property" (* TODO *) in
   let acsl = Format.asprintf "@[<hov>%a@]" Property.pretty ip in
-  let alarm_or_prop = Red_statuses.Prop ip in
-  { function_name; ip; kind; alarm_or_prop; acsl; callstacks }
+  { function_name; ip; kind; acsl; callstacks }
 
 
 

src/plugins/value/utils/value_perf.ml

@@ -47,10 +47,6 @@ module Call_info = struct
     (* How many times the function was called. *)
     mutable nb_calls: int;
 
-    (* How many times the call had to be computed (i.e. with calls
-       cached with memexec removed) *)
-    mutable nb_effective_calls: int;
-
     (* The accumulated execution time for past calls. *)
     mutable total_duration: float;
 
@@ -60,8 +56,7 @@ module Call_info = struct
   }
   ;;
 
-  let create() = { nb_calls = 0; nb_effective_calls = 0; total_duration = 0.0;
-                   since = [] };;
+  let create() = { nb_calls = 0; total_duration = 0.0; since = [] };;
 
   (* Represents the calls to the main function.  *)
   let main = create();;
@@ -342,7 +337,6 @@ let stop_doing_perf callstack =
 let reset_perf () =
   let reset_callinfo ci =
     ci.Call_info.nb_calls <- 0;
-    ci.Call_info.nb_effective_calls <- 0;
     ci.Call_info.total_duration <- 0.0;
     ci.Call_info.since <- []
   in