[absint] simplify `AbstractInterpreter.Make` functor by hiding `Scheduler` parameter

Summary:
At one point I thought we'd want to have lots of different schedulers for things like exploring loops in different orders, but that hasn't materialized.
Let's make the common use-case simpler by hiding the `Scheduler` parameter inside the `AbstractInterpreter` module.
We can always expose `MakeWithScheduler` later if we want to.

Reviewed By: jberdine

Differential Revision: D4508095

fbshipit-source-id: 726e051

infer/src/backend/preanal.ml

@@ -93,11 +93,7 @@ let add_abstraction_instructions pdesc =
 
 module BackwardCfg = ProcCfg.OneInstrPerNode(ProcCfg.Backward(ProcCfg.Exceptional))
 
-module LivenessAnalysis =
+module LivenessAnalysis = AbstractInterpreter.Make (BackwardCfg) (Liveness.TransferFunctions)
-  AbstractInterpreter.Make
-    (BackwardCfg)
-    (Scheduler.ReversePostorder)
-    (Liveness.TransferFunctions)
 
 module VarDomain = AbstractDomain.FiniteSet(Var.Set)
 
@@ -254,10 +250,7 @@ let add_nullify_instrs pdesc tenv liveness_inv_map =
 module ExceptionalOneInstrPerNodeCfg = ProcCfg.OneInstrPerNode(ProcCfg.Exceptional)
 
 module CopyProp =
-  AbstractInterpreter.Make
+  AbstractInterpreter.Make (ExceptionalOneInstrPerNodeCfg) (CopyPropagation.TransferFunctions)
-    (ExceptionalOneInstrPerNodeCfg)
-    (Scheduler.ReversePostorder)
-    (CopyPropagation.TransferFunctions)
 
 let do_copy_propagation pdesc tenv =
   let proc_cfg = ExceptionalOneInstrPerNodeCfg.from_pdesc pdesc in

infer/src/bufferoverrun/bufferOverrunChecker.ml

@@ -271,11 +271,7 @@ struct
       output_mem
 end
 
-module Analyzer =
+module Analyzer = AbstractInterpreter.Make (ProcCfg.Normal) (TransferFunctions)
-  AbstractInterpreter.Make
-    (ProcCfg.Normal)
-    (Scheduler.ReversePostorder)
-    (TransferFunctions)
 
 module Interprocedural = AbstractInterpreter.Interprocedural (Summary)
 module CFG = Analyzer.TransferFunctions.CFG

infer/src/checkers/AbstractInterpreter.ml

@@ -184,6 +184,8 @@ module Interprocedural (Summ : Summary.S) = struct
       Summ.read_summary proc_desc proc_name
 end
 
-
+module MakeWithScheduler (C : ProcCfg.S) (S : Scheduler.Make) (T : TransferFunctions.Make) =
-module Make (C : ProcCfg.S) (S : Scheduler.Make) (T : TransferFunctions.Make) =
   MakeNoCFG (S (C)) (T (C))
+
+module Make (C : ProcCfg.S) (T : TransferFunctions.Make) =
+  MakeWithScheduler (C) (Scheduler.ReversePostorder) (T)

infer/src/checkers/AbstractInterpreter.mli

@@ -57,7 +57,6 @@ module MakeNoCFG
     transfer functions from a CFG *)
 module Make
     (CFG : ProcCfg.S)
-    (MakeScheduler : Scheduler.Make)
     (MakeTransferFunctions : TransferFunctions.Make) :
   S with module TransferFunctions = MakeTransferFunctions(CFG)
 

infer/src/checkers/BoundedCallTree.ml

@@ -149,11 +149,7 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
         astate
 end
 
-module Analyzer =
+module Analyzer = AbstractInterpreter.Make (ProcCfg.Exceptional) (TransferFunctions)
-  AbstractInterpreter.Make
-    (ProcCfg.Exceptional)
-    (Scheduler.ReversePostorder)
-    (TransferFunctions)
 
 let loaded_stacktraces =
   (* Load all stacktraces defined in either Config.stacktrace or

infer/src/checkers/SimpleChecker.ml

@@ -80,11 +80,7 @@ module Make (Spec : Spec) : S = struct
         Domain.empty
   end
 
-  module Analyzer =
+  module Analyzer = AbstractInterpreter.Make (ProcCfg.Exceptional) (TransferFunctions)
-    AbstractInterpreter.Make
-      (ProcCfg.Exceptional)
-      (Scheduler.ReversePostorder)
-      (TransferFunctions)
 
   let checker { Callbacks.proc_desc; proc_name; tenv; } =
     let nodes = Procdesc.get_nodes proc_desc in

infer/src/checkers/Siof.ml

@@ -103,11 +103,7 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
         astate
 end
 
-module Analyzer =
+module Analyzer = AbstractInterpreter.Make (ProcCfg.Normal) (TransferFunctions)
-  AbstractInterpreter.Make
-    (ProcCfg.Normal)
-    (Scheduler.ReversePostorder)
-    (TransferFunctions)
 
 module Interprocedural = AbstractInterpreter.Interprocedural (Summary)
 

infer/src/checkers/ThreadSafety.ml

@@ -440,11 +440,7 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
         astate
 end
 
-module Analyzer =
+module Analyzer = AbstractInterpreter.Make (ProcCfg.Normal) (TransferFunctions)
-  AbstractInterpreter.Make
-    (ProcCfg.Normal)
-    (Scheduler.ReversePostorder)
-    (TransferFunctions)
 
 module Interprocedural = AbstractInterpreter.Interprocedural (Summary)
 

infer/src/checkers/addressTaken.ml

@@ -43,6 +43,4 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
         astate
 end
 
-module Analyzer =
+module Analyzer = AbstractInterpreter.Make (ProcCfg.Exceptional) (TransferFunctions)
-  AbstractInterpreter.Make
-    (ProcCfg.Exceptional) (Scheduler.ReversePostorder) (TransferFunctions)

infer/src/checkers/annotationReachability.ml

@@ -327,11 +327,7 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
         astate
 end
 
-module Analyzer =
+module Analyzer = AbstractInterpreter.Make (ProcCfg.Exceptional) (TransferFunctions)
-  AbstractInterpreter.Make
-    (ProcCfg.Exceptional)
-    (Scheduler.ReversePostorder)
-    (TransferFunctions)
 
 module Interprocedural = struct
   include AbstractInterpreter.Interprocedural(Summary)

infer/src/checkers/liveness.ml

@@ -55,7 +55,4 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
 end
 
 module Analyzer =
-  AbstractInterpreter.Make
+  AbstractInterpreter.Make (ProcCfg.Backward(ProcCfg.Exceptional)) (TransferFunctions)
-    (ProcCfg.Backward(ProcCfg.Exceptional))
-    (Scheduler.ReversePostorder)
-    (TransferFunctions)

infer/src/quandary/TaintAnalysis.ml

@@ -483,10 +483,7 @@ module Make (TaintSpecification : TaintSpec.S) = struct
           astate
   end
 
-  module Analyzer = AbstractInterpreter.Make
+  module Analyzer = AbstractInterpreter.Make (ProcCfg.Exceptional) (TransferFunctions)
-      (ProcCfg.Exceptional)
-      (Scheduler.ReversePostorder)
-      (TransferFunctions)
 
   let make_summary formal_map access_tree =
     let access_tree' =

infer/src/unit/BoundedCallTreeTests.ml

@@ -11,9 +11,9 @@ open! IStd
 
 module F = Format
 
-module TestInterpreter = AnalyzerTester.Make
+module TestInterpreter =
+  AnalyzerTester.Make
     (ProcCfg.Exceptional)
-    (Scheduler.ReversePostorder)
     (BoundedCallTree.TransferFunctions)
 
 let mock_get_proc_desc _ = None

infer/src/unit/TaintTests.ml

@@ -48,10 +48,7 @@ module MockTaintAnalysis = TaintAnalysis.Make(struct
     let handle_unknown_call _ _ _ = []
   end)
 
-module TestInterpreter = AnalyzerTester.Make
+module TestInterpreter = AnalyzerTester.Make (ProcCfg.Normal) (MockTaintAnalysis.TransferFunctions)
-    (ProcCfg.Normal)
-    (Scheduler.ReversePostorder)
-    (MockTaintAnalysis.TransferFunctions)
 
 let tests =
   let open OUnit2 in

infer/src/unit/abstractInterpreterTests.ml

@@ -58,12 +58,10 @@ end
 
 module NormalTestInterpreter = AnalyzerTester.Make
     (ProcCfg.Normal)
-    (Scheduler.ReversePostorder)
     (PathCountTransferFunctions)
 
 module ExceptionalTestInterpreter = AnalyzerTester.Make
     (ProcCfg.Exceptional)
-    (Scheduler.ReversePostorder)
     (PathCountTransferFunctions)
 
 let tests =

infer/src/unit/addressTakenTests.ml

@@ -11,10 +11,7 @@ open! IStd
 
 module F = Format
 
-module TestInterpreter = AnalyzerTester.Make
+module TestInterpreter = AnalyzerTester.Make (ProcCfg.Exceptional) (AddressTaken.TransferFunctions)
-    (ProcCfg.Exceptional)
-    (Scheduler.ReversePostorder)
-    (AddressTaken.TransferFunctions)
 
 let tests =
   let open OUnit2 in

infer/src/unit/analyzerTester.ml

@@ -155,14 +155,11 @@ module StructuredSil = struct
     call_unknown None arg_strs
 end
 
-module Make
+module Make (CFG : ProcCfg.S with type node = Procdesc.Node.t) (T : TransferFunctions.Make) = struct
-    (CFG : ProcCfg.S with type node = Procdesc.Node.t)
-    (S : Scheduler.Make)
-    (T : TransferFunctions.Make) = struct
 
   open StructuredSil
 
-  module I = AbstractInterpreter.Make (CFG) (S) (T)
+  module I = AbstractInterpreter.Make (CFG) (T)
   module M = I.InvariantMap
 
   type assert_map = string M.t

infer/src/unit/copyPropagationTests.ml

@@ -11,10 +11,8 @@ open! IStd
 
 module F = Format
 
-module TestInterpreter = AnalyzerTester.Make
+module TestInterpreter =
-    (ProcCfg.Exceptional)
+  AnalyzerTester.Make (ProcCfg.Exceptional) (CopyPropagation.TransferFunctions)
-    (Scheduler.ReversePostorder)
-    (CopyPropagation.TransferFunctions)
 
 let tests =
   let open OUnit2 in

infer/src/unit/livenessTests.ml

@@ -11,10 +11,8 @@ open! IStd
 
 module F = Format
 
-module TestInterpreter = AnalyzerTester.Make
+module TestInterpreter =
-    (ProcCfg.Backward(ProcCfg.Normal))
+  AnalyzerTester.Make (ProcCfg.Backward(ProcCfg.Normal)) (Liveness.TransferFunctions)
-    (Scheduler.ReversePostorder)
-    (Liveness.TransferFunctions)
 
 let tests =
   let open OUnit2 in