Replace some typ matching with predicates

Author: sim642

src/analyses/base.ml

@@ -2030,10 +2030,11 @@ struct
       match exp with
       | None -> nst
       | Some exp ->
-        let t_override = match Cilfacade.fundec_return_type fundec with (* TODO: unrolltype? *)
-          | TVoid _ -> M.warn ~category:M.Category.Program "Returning a value from a void function"; assert false
-          | ret -> ret
-        in
+        let t_override = Cilfacade.fundec_return_type fundec in
+        if Cil.isVoidType t_override then (
+          M.warn ~category:M.Category.Program "Returning a value from a void function";
+          assert false
+        );
         let rv = eval_rv ~man man.local exp in
         let st' = set ~man ~t_override nst (return_var ()) t_override rv in
         match ThreadId.get_current ask with

src/analyses/mutexAnalysis.ml

@@ -337,11 +337,7 @@ struct
             | ts when Queries.TS.is_top ts ->
               ()
             | ts ->
-              let f = function (* TODO: unrolltype? *)
-                | TComp (_, _) -> true
-                | _ -> false
-              in
-              if Queries.TS.exists f ts then
+              if Queries.TS.exists Cilfacade.isStructOrUnionType ts then
                 old_access None
           end;
           on_ad ad

src/cdomain/value/cdomains/structDomain.ml

@@ -503,8 +503,8 @@ struct
   let chosen_domain () = get_string "ana.base.structs.domain"
 
   let pick_combined setting (comp: compinfo) =
-    let all_bool () = List.for_all (fun f -> match f.ftype with TInt(IBool, _) -> true | _ -> false) comp.cfields in (* TODO: unrolltype? *)
-    let has_ptr () = List.exists (fun f -> match f.ftype with TPtr(_, _) -> true | _ -> false) comp.cfields in (* TODO: unrolltype? *)
+    let all_bool () = List.for_all (fun f -> Cilfacade.isBoolType f.ftype) comp.cfields in
+    let has_ptr () = List.exists (fun f -> Cil.isPointerType f.ftype) comp.cfields in
     match setting with
     | "combined-sk" -> if has_ptr () then "keyed" else "simple"
     | "combined-all" ->

src/cdomain/value/cdomains/valueDomain.ml

@@ -508,7 +508,7 @@ struct
               | Int x when ID.to_int x = Some Z.zero -> AD.null_ptr
               | Int x -> AD.top_ptr
               (* we ignore casts to void*! TODO report UB! *)
-              | Address x -> (match t with TVoid _ -> x | _ -> cast_addr t x) (* TODO: unrolltype? *)
+              | Address x -> (match t with TVoid _ -> x | _ -> cast_addr t x) (* TODO: unrolltype? TVoid unreachable? always goes to previous case? *)
               (*| Address x -> x*)
               | _ -> log_top __POS__; AD.top_ptr
             )

src/common/util/cilfacade.ml

@@ -27,6 +27,11 @@ let isCharType t =
   | TInt ((IChar | ISChar | IUChar), _) -> true
   | _ -> false
 
+let isBoolType t =
+  match Cil.unrollType t with
+  | TInt (IBool, _) -> true
+  | _ -> false
+
 let isFloatType t =
   match Cil.unrollType t with
   | TFloat _ -> true
@@ -39,6 +44,11 @@ let rec isVLAType t = (* TODO: use in base? *)
     variable_len || isVLAType et
   | _ -> false
 
+let isStructOrUnionType t =
+  match Cil.unrollType t with
+  | TComp _ -> true
+  | _ -> false
+
 let is_first_field x = match x.fcomp.cfields with
   | [] -> false
   | f :: _ -> CilType.Fieldinfo.equal f x