pghs975uc
/
infer_clone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
master
Sam Blackshear 9 years ago committed by Facebook Github Bot
parent fb14d31bb7
commit 4627bb6f48
19 changed files with 25 additions and 78 deletions
Show Stats Download Patch File Download Diff File

11
infer/src/backend/preanal.ml
Unescape View File

@ -93,11 +93,7 @@ let add_abstraction_instructions pdesc =
module BackwardCfg = ProcCfg.OneInstrPerNode(ProcCfg.Backward(ProcCfg.Exceptional))
module LivenessAnalysis =
AbstractInterpreter.Make
(BackwardCfg)
(Scheduler.ReversePostorder)
(Liveness.TransferFunctions)
module LivenessAnalysis = AbstractInterpreter.Make (BackwardCfg) (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
(ExceptionalOneInstrPerNodeCfg)
(Scheduler.ReversePostorder)
(CopyPropagation.TransferFunctions)
AbstractInterpreter.Make (ExceptionalOneInstrPerNodeCfg) (CopyPropagation.TransferFunctions)
let do_copy_propagation pdesc tenv =
let proc_cfg = ExceptionalOneInstrPerNodeCfg.from_pdesc pdesc in

6
infer/src/bufferoverrun/bufferOverrunChecker.ml
Unescape View File

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

6
infer/src/checkers/AbstractInterpreter.ml
Unescape View File

@ -184,6 +184,8 @@ module Interprocedural (Summ : Summary.S) = struct
Summ.read_summary proc_desc proc_name
end
module Make (C : ProcCfg.S) (S : Scheduler.Make) (T : TransferFunctions.Make) =
module MakeWithScheduler (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)

1
infer/src/checkers/AbstractInterpreter.mli
Unescape View File

@ -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)

6
infer/src/checkers/BoundedCallTree.ml
Unescape View File

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

6
infer/src/checkers/SimpleChecker.ml
Unescape View File

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

6
infer/src/checkers/Siof.ml
Unescape View File

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

6
infer/src/checkers/ThreadSafety.ml
Unescape View File

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

4
infer/src/checkers/addressTaken.ml
Unescape View File

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

6
infer/src/checkers/annotationReachability.ml
Unescape View File

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

5
infer/src/checkers/liveness.ml
Unescape View File

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

5
infer/src/quandary/TaintAnalysis.ml
Unescape View File

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

4
infer/src/unit/BoundedCallTreeTests.ml
Unescape View File

@ -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

5
infer/src/unit/TaintTests.ml
Unescape View File

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

2
infer/src/unit/abstractInterpreterTests.ml
Unescape View File

@ -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 =

5
infer/src/unit/addressTakenTests.ml
Unescape View File

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

7
infer/src/unit/analyzerTester.ml
Unescape View File

@ -155,14 +155,11 @@ module StructuredSil = struct
call_unknown None arg_strs
end
module Make
(CFG : ProcCfg.S with type node = Procdesc.Node.t)
(S : Scheduler.Make)
(T : TransferFunctions.Make) = struct
module Make (CFG : ProcCfg.S with type node = Procdesc.Node.t) (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

6
infer/src/unit/copyPropagationTests.ml
Unescape View File

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

6
infer/src/unit/livenessTests.ml
Unescape View File

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

Write Preview
Loading…
Cancel
Save