From 3ff9a3127c396771c3ee82749aa61068dbfc8f19 Mon Sep 17 00:00:00 2001
From: Mehdi Bouaziz <mbouaziz@fb.com>
Date: Sun, 7 Oct 2018 01:23:20 -0700
Subject: [PATCH] [uninit] Use LowerHIL-AI directly

Summary:
Using debugging on uninit raised an exception. A file was opened twice and closed twice.
This happened because the two abstract interpreters (SIL, LowerHIL) conflicted.
Let's use the LowerHIL-AI directly

Reviewed By: jvillard

Differential Revision: D10126442

fbshipit-source-id: 113c9e131
---
 infer/src/checkers/uninit.ml | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/infer/src/checkers/uninit.ml b/infer/src/checkers/uninit.ml
index 0ba5202c9..d66b05c45 100644
--- a/infer/src/checkers/uninit.ml
+++ b/infer/src/checkers/uninit.ml
@@ -360,8 +360,7 @@ module TransferFunctions (CFG : ProcCfg.S) = struct
 end
 
 module CFG = ProcCfg.NormalOneInstrPerNode
-module Analyzer =
-  AbstractInterpreter.Make (CFG) (LowerHil.Make (TransferFunctions) (LowerHil.DefaultConfig))
+module Analyzer = LowerHil.MakeAbstractInterpreter (CFG) (TransferFunctions)
 
 let get_locals cfg tenv pdesc =
   List.fold
@@ -399,21 +398,16 @@ let checker {Callbacks.tenv; summary; proc_desc} : Summary.t =
   (* start with empty set of uninit local vars and  empty set of init formal params *)
   let formal_map = FormalMap.make proc_desc in
   let uninit_vars = get_locals cfg tenv proc_desc in
-  let init =
-    ( { RecordDomain.uninit_vars= UninitVars.of_list uninit_vars
-      ; RecordDomain.aliased_vars= AliasedVars.empty
-      ; RecordDomain.prepost= (D.empty, D.empty) }
-    , IdAccessPathMapDomain.empty )
+  let initial =
+    { RecordDomain.uninit_vars= UninitVars.of_list uninit_vars
+    ; RecordDomain.aliased_vars= AliasedVars.empty
+    ; RecordDomain.prepost= (D.empty, D.empty) }
   in
-  let invariant_map =
-    Analyzer.exec_cfg cfg
-      (ProcData.make proc_desc tenv (formal_map, summary))
-      ~initial:init ~debug:false
-  in
-  match Analyzer.extract_post (CFG.Node.id (CFG.exit_node cfg)) invariant_map with
+  let proc_data = ProcData.make proc_desc tenv (formal_map, summary) in
+  match Analyzer.compute_post proc_data ~initial with
   | Some
-      ( {RecordDomain.uninit_vars= _; RecordDomain.aliased_vars= _; RecordDomain.prepost= pre, post}
-      , _ ) ->
+      {RecordDomain.uninit_vars= _; RecordDomain.aliased_vars= _; RecordDomain.prepost= pre, post}
+    ->
       Payload.update_summary {pre; post} summary
   | None ->
       if Procdesc.Node.get_succs (Procdesc.get_start_node proc_desc) <> [] then (