From 23ee36e44efd7f3d21e43f9bed68272eaee216f5 Mon Sep 17 00:00:00 2001
From: Sungkeun Cho <scho@fb.com>
Date: Tue, 18 Feb 2020 02:32:58 -0800
Subject: [PATCH] [inferbo] Move Split modules to next of StdVector

Reviewed By: ezgicicek

Differential Revision: D19942997

fbshipit-source-id: 8a8ea3bf6
---
 .../src/bufferoverrun/bufferOverrunModels.ml  | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/infer/src/bufferoverrun/bufferOverrunModels.ml b/infer/src/bufferoverrun/bufferOverrunModels.ml
index 640bd6993..1984fded3 100644
--- a/infer/src/bufferoverrun/bufferOverrunModels.ml
+++ b/infer/src/bufferoverrun/bufferOverrunModels.ml
@@ -473,44 +473,6 @@ module CFArray = struct
     {exec; check= no_check}
 end
 
-module Split = struct
-  let std_vector ~adds_at_least_one {exp= vector_exp; typ= vector_typ} location mem =
-    let increment = if adds_at_least_one then Dom.Val.Itv.pos else Dom.Val.Itv.nat in
-    let vector_type_name = Option.value_exn (vector_typ |> Typ.strip_ptr |> Typ.name) in
-    let size_field = Fieldname.make vector_type_name "infer_size" in
-    let vector_size_locs = Sem.eval_locs vector_exp mem |> PowLoc.append_field ~fn:size_field in
-    let f_trace _ traces = Trace.(Set.add_elem location (through ~risky_fun:None)) traces in
-    Dom.Mem.transform_mem ~f:(Dom.Val.plus_a ~f_trace increment) vector_size_locs mem
-end
-
-module Boost = struct
-  module Split = struct
-    let std_vector vector_arg =
-      let exec {location} ~ret:_ mem =
-        Split.std_vector ~adds_at_least_one:true vector_arg location mem
-      in
-      {exec; check= no_check}
-  end
-end
-
-module Folly = struct
-  module Split = struct
-    let std_vector vector_arg ignore_empty_opt =
-      let exec {location; integer_type_widths} ~ret:_ mem =
-        let adds_at_least_one =
-          match ignore_empty_opt with
-          | Some ignore_empty_exp ->
-              Sem.eval integer_type_widths ignore_empty_exp mem |> Dom.Val.get_itv |> Itv.is_false
-          | None ->
-              (* default: ignore_empty is false *)
-              true
-        in
-        Split.std_vector ~adds_at_least_one vector_arg location mem
-      in
-      {exec; check= no_check}
-  end
-end
-
 module StdArray = struct
   let constructor _size =
     let exec _model_env ~ret:_ mem = mem (* initialize? *) in
@@ -711,6 +673,44 @@ module StdVector = struct
     {exec; check= no_check}
 end
 
+module Split = struct
+  let std_vector ~adds_at_least_one {exp= vector_exp; typ= vector_typ} location mem =
+    let increment = if adds_at_least_one then Dom.Val.Itv.pos else Dom.Val.Itv.nat in
+    let vector_type_name = Option.value_exn (vector_typ |> Typ.strip_ptr |> Typ.name) in
+    let size_field = Fieldname.make vector_type_name "infer_size" in
+    let vector_size_locs = Sem.eval_locs vector_exp mem |> PowLoc.append_field ~fn:size_field in
+    let f_trace _ traces = Trace.(Set.add_elem location (through ~risky_fun:None)) traces in
+    Dom.Mem.transform_mem ~f:(Dom.Val.plus_a ~f_trace increment) vector_size_locs mem
+end
+
+module Boost = struct
+  module Split = struct
+    let std_vector vector_arg =
+      let exec {location} ~ret:_ mem =
+        Split.std_vector ~adds_at_least_one:true vector_arg location mem
+      in
+      {exec; check= no_check}
+  end
+end
+
+module Folly = struct
+  module Split = struct
+    let std_vector vector_arg ignore_empty_opt =
+      let exec {location; integer_type_widths} ~ret:_ mem =
+        let adds_at_least_one =
+          match ignore_empty_opt with
+          | Some ignore_empty_exp ->
+              Sem.eval integer_type_widths ignore_empty_exp mem |> Dom.Val.get_itv |> Itv.is_false
+          | None ->
+              (* default: ignore_empty is false *)
+              true
+        in
+        Split.std_vector ~adds_at_least_one vector_arg location mem
+      in
+      {exec; check= no_check}
+  end
+end
+
 module StdBasicString = struct
   let constructor_from_char_ptr char_typ {exp= tgt_exp; typ= tgt_typ} src ~len_opt =
     let exec ({pname; node_hash} as model_env) ~ret mem =