[classloads] treat loads and stores wrt to field derefs

Reviewed By: mbouaziz

Differential Revision: D13761363

fbshipit-source-id: bcaddd13b

infer/src/IR/Typ.mli

@@ -615,11 +615,9 @@ module Fieldname : sig
   (** Equality for field names. *)
 
   (** Set for fieldnames *)
-
   module Set : Caml.Set.S with type elt = t
 
   (** Map for fieldnames *)
-
   module Map : Caml.Map.S with type key = t
 
   module Clang : sig

infer/src/concurrency/classLoads.ml

@@ -23,17 +23,52 @@ let get_java_class = function
       None
 
 
+let rec exp_fold_over_fields ~f (exp : Exp.t) acc =
+  match exp with
+  (* TODO Cast? Const literals for class objects? Arrays? *)
+  | Var _ | Const _ | Lvar _ | Sizeof _ | Closure _ ->
+      acc
+  | Cast (_, e) | UnOp (_, e, _) | Exn e | Lindex (e, _) ->
+      exp_fold_over_fields ~f e acc
+  | BinOp (_, e1, e2) ->
+      exp_fold_over_fields ~f e1 acc |> exp_fold_over_fields ~f e2
+  | Lfield (e, field, typ) ->
+      f field typ acc |> exp_fold_over_fields ~f e
+
+
+let class_of_type (typ : Typ.t) =
+  match typ with
+  | {desc= Tstruct name} | {desc= Tptr ({desc= Tstruct name}, _)} ->
+      Some name
+  | _ ->
+      None
+
+
+let add_field_loads_of_exp exp loc astate =
+  let f _field typ init =
+    class_of_type typ |> Option.map ~f:Typ.Name.name
+    |> Option.fold ~init ~f:(ClassLoadsDomain.add_load loc)
+  in
+  exp_fold_over_fields ~f exp astate
+
+
 let exec_instr pdesc astate _ (instr : Sil.instr) =
   match instr with
   | Call (_, Const (Cfun callee), _, loc, _) ->
       Payload.read pdesc callee
       |> Option.fold ~init:astate ~f:(ClassLoadsDomain.integrate_summary callee loc)
+  | Load (_, exp, _, loc) | Prune (exp, loc, _, _) ->
+      add_field_loads_of_exp exp loc astate
+  | Store (lexp, _, rexp, loc) ->
+      add_field_loads_of_exp lexp loc astate |> add_field_loads_of_exp rexp loc
   | _ ->
       astate
 
 
 let report_loads proc_desc summary astate =
   let report_load ({ClassLoadsDomain.Event.loc; elem} as event) =
+    if String.is_prefix ~prefix:"java." elem then ()
+    else
       let ltr = ClassLoadsDomain.Event.make_loc_trace event in
       let msg = Format.asprintf "Class %s loaded" elem in
       Reporting.log_warning summary ~loc ~ltr IssueType.class_load msg

infer/tests/codetoanalyze/java/classloads/Static.java

@@ -9,7 +9,10 @@ class Static {
   // this loads StaticA
   static StaticA s = new StaticA();
 
-  public static void main(String args[]) {}
+  public static void main(String args[]) {
+    // this loads StaticD
+    System.out.println(StaticD.static_data);
+  }
 }
 
 class StaticA {
@@ -23,3 +26,7 @@ class StaticB {
 }
 
 class StaticC {}
+
+class StaticD {
+  static int static_data = 5;
+}