Remove feature part aliases

Summary:
The taint abstract domains (`ForwardTaint`, `ForwardState`, `BackwardTaint`, `BackwardState`) provide aliases to feature parts (`SimpleSet`, `TitoPositionSet`, etc.) that allow fold, transform, partition or reduce operations on a subset of the taint representation.

Let's remove those aliases since we can use the parts. That also makes refactoring easier.

Reviewed By: dkgi

Differential Revision: D30760716

fbshipit-source-id: 83f5b50f1f0ce364eed600d2f259800821a5723c

Author: arthaud

source/interprocedural_analyses/taint/backwardAnalysis.ml

@@ -205,7 +205,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
               in
               let breadcrumbs =
                 BackwardTaint.fold
-                  BackwardTaint.simple_feature_self
+                  Features.SimpleSet.Self
                   element
                   ~f:Features.gather_breadcrumbs
                   ~init:Features.SimpleSet.bottom
@@ -239,10 +239,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
                   read_tree extra_path taint_to_propagate
                   |> BackwardState.Tree.collapse
                        ~transform:(BackwardTaint.add_features Features.tito_broadening)
-                  |> BackwardTaint.transform
-                       BackwardTaint.simple_feature_self
-                       Abstract.Domain.Add
-                       ~f:breadcrumbs
+                  |> BackwardTaint.transform Features.SimpleSet.Self Add ~f:breadcrumbs
                   |> BackwardTaint.transform
                        TraceLength.Self
                        (Context (BackwardTaint.kind, Map))
@@ -257,11 +254,8 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
           in
           let add_tito_feature_and_position leaf_taint =
             leaf_taint
-            |> FlowDetails.transform
-                 FlowDetails.tito_position_element
-                 Abstract.Domain.Add
-                 ~f:location
-            |> FlowDetails.transform FlowDetails.simple_feature Abstract.Domain.Add ~f:Features.tito
+            |> FlowDetails.transform Features.TitoPositionSet.Element Add ~f:location
+            |> FlowDetails.transform Features.SimpleSet.Element Add ~f:Features.tito
           in
           BackwardState.read
             ~transform_non_leaves
@@ -295,7 +289,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
           in
           let taint_in_taint_out =
             BackwardState.Tree.transform
-              FlowDetails.tito_position_element
+              Features.TitoPositionSet.Element
               Add
               ~f:argument.Node.location
               obscure_taint
@@ -324,7 +318,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
                 let features_to_add =
                   BackwardState.Tree.filter_by_kind ~kind:Sinks.AddFeatureToArgument sink_taint
                   |> BackwardTaint.fold
-                       BackwardTaint.simple_feature_self
+                       Features.SimpleSet.Self
                        ~f:Features.gather_breadcrumbs
                        ~init:Features.SimpleSet.bottom
                 in
@@ -333,10 +327,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
                 else
                   let taint =
                     BackwardState.read state.taint ~root ~path
-                    |> BackwardState.Tree.transform
-                         BackwardTaint.simple_feature_self
-                         Abstract.Domain.Add
-                         ~f:features_to_add
+                    |> BackwardState.Tree.transform Features.SimpleSet.Self Add ~f:features_to_add
                   in
                   { taint = BackwardState.assign ~root ~path taint state.taint }
             | None -> state
@@ -359,10 +350,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
             BackwardState.Tree.collapse
               ~transform:(BackwardTaint.add_features Features.tito_broadening)
               call_taint
-            |> BackwardTaint.transform
-                 BackwardTaint.simple_feature_self
-                 Abstract.Domain.Add
-                 ~f:breadcrumbs
+            |> BackwardTaint.transform Features.SimpleSet.Self Add ~f:breadcrumbs
             |> BackwardState.Tree.create_leaf
           else
             BackwardState.Tree.bottom
@@ -390,7 +378,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
           let analyze_argument ~resolution taint { Call.Argument.value = argument; _ } state =
             let taint =
               BackwardState.Tree.transform
-                FlowDetails.tito_position_element
+                Features.TitoPositionSet.Element
                 Add
                 ~f:argument.Node.location
                 taint
@@ -401,7 +389,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
             BackwardState.Tree.collapse
               ~transform:(BackwardTaint.add_features Features.tito_broadening)
               call_taint
-            |> BackwardTaint.transform BackwardTaint.simple_feature Add ~f:Features.obscure
+            |> BackwardTaint.transform Features.SimpleSet.Element Add ~f:Features.obscure
             |> BackwardState.Tree.create_leaf
           in
           let state =
@@ -563,7 +551,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
                       | _ :: index :: _ ->
                           let label = get_index index.value in
                           BackwardState.Tree.transform
-                            BackwardTaint.first_indices
+                            Features.FirstIndexSet.Self
                             Map
                             ~f:(add_first_index label)
                             taint
@@ -688,7 +676,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
             BackwardState.Tree.join
               taint
               (get_taint (Some (AccessPath.create (Root.Variable "$all") [])) state)
-            |> BackwardState.Tree.transform BackwardTaint.simple_feature Add ~f:Features.lambda
+            |> BackwardState.Tree.transform Features.SimpleSet.Element Add ~f:Features.lambda
           in
           let all_assignee =
             Node.create
@@ -729,7 +717,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
           let taint =
             BackwardState.Tree.prepend [index] taint
             |> BackwardState.Tree.transform
-                 BackwardTaint.first_indices
+                 Features.FirstIndexSet.Self
                  Map
                  ~f:(add_first_index index)
           in
@@ -950,8 +938,8 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
                 (Name.Attribute
                   { base = { Node.value = Expression.String _; _ }; attribute = "format"; _ }) ->
                 BackwardState.Tree.transform
-                  BackwardTaint.simple_feature
-                  Abstract.Domain.Add
+                  Features.SimpleSet.Element
+                  Add
                   ~f:Features.format_string
                   taint
             | _ -> taint
@@ -1017,8 +1005,8 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
           in
           let taint =
             BackwardState.Tree.transform
-              BackwardTaint.simple_feature
-              Abstract.Domain.Add
+              Features.SimpleSet.Element
+              Add
               ~f:Features.format_string
               taint
           in
@@ -1047,11 +1035,7 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
           | Some override -> analyze_expression ~resolution ~taint ~state ~expression:override
           | None ->
               let taint =
-                BackwardState.Tree.transform
-                  FlowDetails.simple_feature_self
-                  Add
-                  ~f:Features.type_bool
-                  taint
+                BackwardState.Tree.transform Features.SimpleSet.Self Add ~f:Features.type_bool taint
               in
               analyze_expression ~resolution ~taint ~state ~expression:right
               |> fun state -> analyze_expression ~resolution ~taint ~state ~expression:left)
@@ -1131,8 +1115,8 @@ module AnalysisInstance (FunctionContext : FUNCTION_CONTEXT) = struct
                 in
                 if not (Features.SimpleSet.is_bottom attribute_features) then
                   BackwardState.Tree.transform
-                    BackwardTaint.simple_feature_self
-                    Abstract.Domain.Add
+                    Features.SimpleSet.Self
+                    Add
                     ~f:attribute_features
                     taint
                 else
@@ -1411,10 +1395,7 @@ let extract_tito_and_sink_models define ~is_constructor ~resolution ~existing_ba
       ~transform:(BackwardTaint.add_features Features.widen_broadening)
       tree
       ~mold:essential
-    |> BackwardState.Tree.transform
-         BackwardTaint.simple_feature_self
-         Abstract.Domain.Add
-         ~f:type_breadcrumbs
+    |> BackwardState.Tree.transform Features.SimpleSet.Self Add ~f:type_breadcrumbs
     |> BackwardState.Tree.limit_to
          ~transform:(BackwardTaint.add_features Features.widen_broadening)
          ~width:maximum_model_width

source/interprocedural_analyses/taint/domains.ml

@@ -220,20 +220,9 @@ module FlowDetails = struct
 
 
   let strip_tito_positions =
-    transform Features.TitoPositionSet.Self Abstract.Domain.Map ~f:(fun _ ->
-        Features.TitoPositionSet.bottom)
+    transform Features.TitoPositionSet.Self Map ~f:(fun _ -> Features.TitoPositionSet.bottom)
 
 
-  let leaf_name_set = Features.LeafNameSet.Self
-
-  let simple_feature = Features.SimpleSet.Element
-
-  let simple_feature_element = Features.SimpleSet.ElementAndUnder
-
-  let simple_feature_self = Features.SimpleSet.Self
-
-  let tito_position_element = Features.TitoPositionSet.Element
-
   let product_pp = pp (* shadow *)
 
   let pp formatter = Format.fprintf formatter "FlowDetails(%a)" product_pp
@@ -263,21 +252,6 @@ module type TAINT_DOMAIN = sig
 
   val trace_info : TraceInfo.t Abstract.Domain.part
 
-  val flow_details : FlowDetails.t Abstract.Domain.part
-
-  val leaf_name_set : Features.LeafNameSet.t Abstract.Domain.part
-
-  val simple_feature : Features.Simple.t Abstract.Domain.part
-
-  val simple_feature_element
-    : Features.Simple.t Abstract.OverUnderSetDomain.approximation Abstract.Domain.part
-
-  val simple_feature_self : Features.SimpleSet.t Abstract.Domain.part
-
-  val first_indices : Features.FirstIndexSet.t Abstract.Domain.part
-
-  val first_fields : Features.FirstFieldSet.t Abstract.Domain.part
-
   val add_features : Features.SimpleSet.t -> t -> t
 
   val transform_on_widening_collapse : t -> t
@@ -366,20 +340,6 @@ end = struct
 
   let trace_info = Map.Key
 
-  let flow_details = FlowDetails.Self
-
-  let leaf_name_set = FlowDetails.leaf_name_set
-
-  let simple_feature = FlowDetails.simple_feature
-
-  let simple_feature_self = FlowDetails.simple_feature_self
-
-  let simple_feature_element = FlowDetails.simple_feature_element
-
-  let first_fields = Features.FirstFieldSet.Self
-
-  let first_indices = Features.FirstIndexSet.Self
-
   let kinds map =
     Map.fold kind ~init:[] ~f:List.cons map |> List.dedup_and_sort ~compare:Kind.compare
 
@@ -406,7 +366,7 @@ end = struct
           :: leaves
         in
         let breadcrumbs =
-          FlowDetails.(fold simple_feature_element ~f:gather_json ~init:[] features)
+          FlowDetails.fold Features.SimpleSet.ElementAndUnder ~f:gather_json ~init:[] features
         in
         let leaves =
           FlowDetails.get FlowDetails.Slots.LeafName features
@@ -461,7 +421,7 @@ end = struct
       KindTaintDomain.Map.to_alist kind_taint |> List.map ~f:(leaf_to_json trace_info)
     in
     (* expand now do dedup possibly abstract targets that resolve to the same concrete ones *)
-    let taint = Map.transform Key Abstract.Domain.Map ~f:TraceInfo.expand_call_site taint in
+    let taint = Map.transform Key Map ~f:TraceInfo.expand_call_site taint in
     let elements = Map.to_alist taint |> List.concat_map ~f:trace_to_json in
     `List elements
 
@@ -472,9 +432,7 @@ end = struct
     create_json ~trace_info_to_json:(TraceInfo.to_external_json ~filename_lookup)
 
 
-  let add_features features =
-    transform FlowDetails.simple_feature_self Abstract.Domain.Add ~f:features
-
+  let add_features features = transform Features.SimpleSet.Self Add ~f:features
 
   let transform_on_widening_collapse =
     (* using an always-feature here would break the widening invariant: a <= a widen b *)
@@ -503,7 +461,7 @@ end = struct
       let kind_taint =
         KindTaintDomain.transform
           Features.TitoPositionSet.Self
-          Abstract.Domain.Map
+          Map
           ~f:(fun _ -> Features.TitoPositionSet.bottom)
           kind_taint
       in
@@ -513,8 +471,7 @@ end = struct
           let increase_length n = if n < max_int then n + 1 else n in
           let trace_info = CallSite { location; callees; port; path } in
           let kind_taint =
-            kind_taint
-            |> KindTaintDomain.transform TraceLength.Self Abstract.Domain.Map ~f:increase_length
+            kind_taint |> KindTaintDomain.transform TraceLength.Self Map ~f:increase_length
           in
           trace_info, kind_taint
       | Declaration { leaf_name_provided } ->
@@ -530,15 +487,11 @@ end = struct
               List.map ~f:make_leaf_name callees |> Features.LeafNameSet.of_list
           in
           let kind_taint =
-            KindTaintDomain.transform
-              Features.LeafNameSet.Self
-              Abstract.Domain.Add
-              ~f:new_leaf_names
-              kind_taint
+            KindTaintDomain.transform Features.LeafNameSet.Self Add ~f:new_leaf_names kind_taint
           in
           trace_info, kind_taint
     in
-    Map.transform Map.KeyValue Abstract.Domain.Map ~f:apply taint
+    Map.transform Map.KeyValue Map ~f:apply taint
 end
 
 module ForwardTaint = MakeTaint (Sources)
@@ -620,11 +573,7 @@ module MakeTaintTree (Taint : TAINT_DOMAIN) () = struct
 
   let get_all_features taint_tree =
     let gather_features to_add features = Features.SimpleSet.add_set features ~to_add in
-    fold
-      FlowDetails.simple_feature_self
-      ~f:gather_features
-      ~init:Features.SimpleSet.bottom
-      taint_tree
+    fold Features.SimpleSet.Self ~f:gather_features ~init:Features.SimpleSet.bottom taint_tree
 end
 
 module MakeTaintEnvironment (Taint : TAINT_DOMAIN) () = struct
@@ -702,7 +651,7 @@ module MakeTaintEnvironment (Taint : TAINT_DOMAIN) () = struct
     read ~root ~path:[] taint
     |> Tree.transform Taint.kind Filter ~f:(Taint.equal_kind attach_to_kind)
     |> Tree.collapse ~transform:Fn.id
-    |> Taint.fold Taint.simple_feature_self ~f:gather_features ~init:Features.SimpleSet.bottom
+    |> Taint.fold Features.SimpleSet.Self ~f:gather_features ~init:Features.SimpleSet.bottom
 end
 
 module ForwardState = MakeTaintEnvironment (ForwardTaint) ()