From 3193cb31e1b1f2455406ea0c819dad9dfa2ba10d Mon Sep 17 00:00:00 2001
From: ivg <ivg@ieee.org>
Date: Wed, 25 Nov 2020 08:33:53 -0500
Subject: [PATCH] updates bindings to the latest changes in core_kernel

---
 bap/lib/.merlin     |  2 ++
 bap/lib/bindings.ml | 23 +++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 bap/lib/.merlin

diff --git a/bap/lib/.merlin b/bap/lib/.merlin
new file mode 100644
index 0000000..4e47826
--- /dev/null
+++ b/bap/lib/.merlin
@@ -0,0 +1,2 @@
+PKG bap
+PKG ctypes
diff --git a/bap/lib/bindings.ml b/bap/lib/bindings.ml
index eaadf10..e733a12 100644
--- a/bap/lib/bindings.ml
+++ b/bap/lib/bindings.ml
@@ -5,7 +5,7 @@ open Graphlib.Std
 open Bap_plugins.Std
 open Format
 module C = Ctypes
-open Polymorphic_compare
+open Poly
 
 include Self()
 
@@ -444,7 +444,7 @@ struct
         type t = elt seq
         include (struct
           include Seq
-          let mem = mem ~equal
+          let mem = Seq.mem ~equal:Poly.equal
         end : Container.S1 with type 'a t := 'a seq)
       end in
       let name = Opaque.name elt in
@@ -1460,8 +1460,8 @@ struct
 
     def "create" C.(string @-> string_opt @-> returning !?t)
       (fun path backend ->
-        let backend = Option.value ~default:"llvm" backend in
-        lift_result (Image.create ~backend path));
+         let backend = Option.value ~default:"llvm" backend in
+         lift_result (Image.create ~backend path));
 
     def "of_data"
       C.(ptr char @-> int @-> string_opt @-> returning !?t )
@@ -1756,6 +1756,7 @@ struct
   end
 
   module Rooter = struct
+    [@@@warning "-D"]
     let t : rooter opaque = Opaque.newtype "rooter"
     let def fn = def ("rooter_" ^ fn);;
     Source.factory (module Rooter.Factory) Source.rooter "rooter";
@@ -1765,11 +1766,13 @@ struct
   end
 
   module Brancher = struct
+    [@@@warning "-D"]
     let t : brancher opaque = Opaque.newtype "brancher";;
     Source.factory (module Brancher.Factory) Source.brancher "brancher"
   end
 
   module Symbolizer = struct
+    [@@@warning "-D"]
     let t : symbolizer opaque = Opaque.newtype "symbolizer";;
     Source.factory (module Symbolizer.Factory) Source.symbolizer "symbolizer"
   end
@@ -2509,8 +2512,8 @@ struct
 
       def "file" C.(string @-> string_opt @-> returning !!t)
         (fun filename loader ->
-          let loader = Option.value ~default:"llvm" loader in
-          Project.Input.file ~loader ~filename);
+           let loader = Option.value ~default:"llvm" loader in
+           Project.Input.file ~loader ~filename);
       def "binary"
         C.(string @-> Arch.total @-> !?Word.t @-> returning !!t)
         (fun filename arch base ->
@@ -2784,10 +2787,10 @@ struct
       let check = function
         | Ok () -> 0
         | Error e ->
-           let _ =
-             Error.lift @@
-             Error.failf "%a" Bap_main.Extension.Error.pp e in
-           -1 in
+          let _ =
+            Error.lift @@
+            Error.failf "%a" Bap_main.Extension.Error.pp e in
+          -1 in
       if C.is_null params then Bap_main.init () |> check
       else
         let features = listo features in