From 095b946a13572d9ce0d4c2a57b91b5ff564f8926 Mon Sep 17 00:00:00 2001
From: Sungkeun Cho <scho@fb.com>
Date: Tue, 14 Jul 2020 05:03:29 -0700
Subject: [PATCH] [CCBM] Support another QE check form

Reviewed By: ezgicicek

Differential Revision: D22501826

fbshipit-source-id: 527e1acd3
---
 .../checkers/ConfigChecksBetweenMarkers.ml    | 34 +++++++++++--------
 infer/src/opensource/FbGKInteraction.mli      |  2 +-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/infer/src/checkers/ConfigChecksBetweenMarkers.ml b/infer/src/checkers/ConfigChecksBetweenMarkers.ml
index 812b54da3..3f6152af8 100644
--- a/infer/src/checkers/ConfigChecksBetweenMarkers.ml
+++ b/infer/src/checkers/ConfigChecksBetweenMarkers.ml
@@ -441,7 +441,21 @@ module Dom = struct
     |> Option.value_map ~default:astate ~f:(fun marker -> call_marker_end marker astate)
 
 
-  let call_config_check analysis_data e location ({mem; context; config_checks} as astate) =
+  let call_config_check analysis_data config location ({context; config_checks} as astate) =
+    let trace_elem = Trace.config_check config in
+    let context = Context.call_config_check trace_elem location context in
+    let context =
+      { context with
+        started_markers= MarkerSet.report analysis_data config location context.started_markers }
+    in
+    let context_with_trace =
+      {ContextWithTrace.context; trace= Trace.singleton trace_elem location}
+    in
+    { astate with
+      config_checks= ConfigChecks.weak_add config context_with_trace location config_checks }
+
+
+  let call_config_check_exp analysis_data e location ({mem} as astate) =
     let astate' =
       let open IOption.Let_syntax in
       let* loc =
@@ -454,17 +468,7 @@ module Dom = struct
             None
       in
       let+ config = Mem.get_config_opt loc mem in
-      let trace_elem = Trace.config_check config in
-      let context = Context.call_config_check trace_elem location context in
-      let context =
-        { context with
-          started_markers= MarkerSet.report analysis_data config location context.started_markers }
-      in
-      let context_with_trace =
-        {ContextWithTrace.context; trace= Trace.singleton trace_elem location}
-      in
-      { astate with
-        config_checks= ConfigChecks.weak_add config context_with_trace location config_checks }
+      call_config_check analysis_data config location astate
     in
     Option.value astate' ~default:astate
 
@@ -581,8 +585,10 @@ module TransferFunctions = struct
         Dom.call_marker_end_id id astate
     | Call (_, Const (Cfun callee), args, location, _) -> (
       match FbGKInteraction.get_config_check tenv callee args with
-      | Some e ->
-          Dom.call_config_check analysis_data e location astate
+      | Some (`Config config) ->
+          Dom.call_config_check analysis_data config location astate
+      | Some (`Exp e) ->
+          Dom.call_config_check_exp analysis_data e location astate
       | None ->
           Option.value_map (analyze_dependency callee) ~default:astate
             ~f:(fun (_, callee_summary) ->
diff --git a/infer/src/opensource/FbGKInteraction.mli b/infer/src/opensource/FbGKInteraction.mli
index 24f0c45f2..5c309a52d 100644
--- a/infer/src/opensource/FbGKInteraction.mli
+++ b/infer/src/opensource/FbGKInteraction.mli
@@ -17,7 +17,7 @@ end
 
 val get_config : 'exp -> 'config_name option
 
-val get_config_check : 'tenv -> 'pname -> 'args -> 'ident option
+val get_config_check : 'tenv -> 'pname -> 'args -> 'a option
 
 val is_config_load : 'pname -> bool