From efd8e767cbf0faa2a4172f28a1775bd964939c85 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Thu, 7 May 2020 08:49:30 -0700
Subject: [PATCH] concurrency/dune

Summary: Last checker :') Well, still have to do labs/.

Reviewed By: ngorogiannis

Differential Revision: D21426424

fbshipit-source-id: d15f13c66
---
 infer/src/concurrency/dune          | 14 ++++++++++++++
 infer/src/concurrency/starvation.ml |  2 +-
 infer/src/deadcode/Makefile         |  4 ++--
 infer/src/dune.in                   |  6 ++++--
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 infer/src/concurrency/dune

diff --git a/infer/src/concurrency/dune b/infer/src/concurrency/dune
new file mode 100644
index 000000000..bc98d2f40
--- /dev/null
+++ b/infer/src/concurrency/dune
@@ -0,0 +1,14 @@
+; Copyright (c) Facebook, Inc. and its affiliates.
+;
+; This source code is licensed under the MIT license found in the
+; LICENSE file in the root directory of this source tree.
+
+(library
+ (name concurrency)
+ (public_name infer.concurrency)
+ (flags
+  (:standard -open Core -open OpenSource -open InferIR -open InferStdlib -open IStd
+    -open InferGenerated -open InferBase -open Absint))
+ (libraries base64 core InferStdlib InferGenerated InferBase InferIR absint)
+ (preprocess (pps ppx_compare))
+)
diff --git a/infer/src/concurrency/starvation.ml b/infer/src/concurrency/starvation.ml
index cd4752d7a..0c027d6c4 100644
--- a/infer/src/concurrency/starvation.ml
+++ b/infer/src/concurrency/starvation.ml
@@ -579,7 +579,7 @@ let fold_reportable_summaries analyze_ondemand tenv clazz ~init ~f =
     |> Option.value_map ~default:[] ~f:(fun tstruct -> tstruct.Struct.methods)
   in
   let f acc mthd =
-    Ondemand.get_proc_desc mthd
+    AnalysisCallbacks.get_proc_desc mthd
     |> Option.value_map ~default:acc ~f:(fun other_pdesc ->
            if should_report other_pdesc then
              analyze_ondemand mthd
diff --git a/infer/src/deadcode/Makefile b/infer/src/deadcode/Makefile
index 29577f98b..dc4021c1b 100644
--- a/infer/src/deadcode/Makefile
+++ b/infer/src/deadcode/Makefile
@@ -50,8 +50,8 @@ endif
 # Note that we run find under _build directory. Since we copy some
 # sources from subfolders to src/ folder to avoid duplicates we use
 # $(DEPTH_ONE) and iteration over main and library folders.
-LIBRARY_FOLDERS = . ./IR ./absint ./atd ./base ./biabduction ./bufferoverrun ./c_stubs ./checkers ./cost ./istd ./nullsafe ./pulse ./quandary ./scripts ./topl
-INCLUDE_FOLDERS = -I absint -I IR -I atd -I base -I biabduction -I bufferoverrun -I c_stubs -I checkers -I cost -I istd -I nullsafe -I pulse -I quandary -I scripts -I topl
+LIBRARY_FOLDERS = . ./IR ./absint ./atd ./base ./biabduction ./bufferoverrun ./c_stubs ./checkers ./concurrency ./cost ./istd ./nullsafe ./pulse ./quandary ./scripts ./topl
+INCLUDE_FOLDERS = -I absint -I IR -I atd -I base -I biabduction -I bufferoverrun -I c_stubs -I checkers -I concurrency -I cost -I istd -I nullsafe -I pulse -I quandary -I scripts -I topl
 
 ml_src_files:=$(shell \
 	cd $(INFER_BUILD_DIR); \
diff --git a/infer/src/dune.in b/infer/src/dune.in
index d788f264d..ad3077167 100644
--- a/infer/src/dune.in
+++ b/infer/src/dune.in
@@ -13,7 +13,6 @@ let source_dirs =
   (if clang then ["al"; "clang"; "unit" ^/ "clang"] else ["clang_stubs"; "unit" ^/ "clang_stubs"])
   @ [ (if java then "java" else "java_stubs")
     ; "backend"
-    ; "concurrency"
     ; "integration"
     ; "labs"
     ; "test_determinator"
@@ -64,6 +63,8 @@ let infer_cflags =
   ; "-open"
   ; "TOPL"
   ; "-open"
+  ; "Concurrency"
+  ; "-open"
   ; "Absint"
   ; "-open"
   ; "OpenSource"
@@ -107,7 +108,8 @@ let main_lib_stanza =
          ; "checkers"
          ; "costlib"
          ; "quandary"
-         ; "TOPL" ] ))
+         ; "TOPL"
+         ; "concurrency" ] ))
     (String.concat " " infer_binaries)