From 113df8b756ccb03c68fa12f9ba1b1b6157e75947 Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Tue, 5 Mar 2019 05:13:02 -0800
Subject: [PATCH] [sledge] Upgrade base to v0.12

Reviewed By: mbouaziz

Differential Revision: D14297867

fbshipit-source-id: 124b34243
---
 sledge/llair.opam            | 1 +
 sledge/sledge.opam           | 1 +
 sledge/src/import/dune.in    | 2 +-
 sledge/src/import/import.ml  | 1 -
 sledge/src/import/import.mli | 1 -
 sledge/src/llair/llair.ml    | 4 ++--
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sledge/llair.opam b/sledge/llair.opam
index 68355e69a..2aa490923 100644
--- a/sledge/llair.opam
+++ b/sledge/llair.opam
@@ -8,6 +8,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
+  "base" {>= "v0.12.0"}
   "cmdliner"
   "core_kernel" {>= "v0.11.0"}
   "ctypes"
diff --git a/sledge/sledge.opam b/sledge/sledge.opam
index 783b6c6dc..3c89e7949 100644
--- a/sledge/sledge.opam
+++ b/sledge/sledge.opam
@@ -8,6 +8,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
+  "base" {>= "v0.12.0"}
   "cmdliner"
   "core_kernel" {>= "v0.11.0"}
   "ctypes"
diff --git a/sledge/src/import/dune.in b/sledge/src/import/dune.in
index 8d18f876e..02cf67d82 100644
--- a/sledge/src/import/dune.in
+++ b/sledge/src/import/dune.in
@@ -16,7 +16,7 @@ Jbuild_plugin.V1.send
  (name import)
  (public_name llair.import)
  %s
- (libraries core_kernel zarith %s))
+ (libraries core_kernel core_kernel.fheap zarith %s))
 |}
      (flags `lib deps)
      (libraries deps)
diff --git a/sledge/src/import/import.ml b/sledge/src/import/import.ml
index fdedeffc4..c5420f371 100644
--- a/sledge/src/import/import.ml
+++ b/sledge/src/import/import.ml
@@ -32,7 +32,6 @@ include (
 external ( == ) : 'a -> 'a -> bool = "%eq"
 
 include Stdio
-module Fheap = Core_kernel.Fheap
 module Hash_queue = Core_kernel.Hash_queue
 
 (** Tuple operations *)
diff --git a/sledge/src/import/import.mli b/sledge/src/import/import.mli
index 7cadc151a..8933797ff 100644
--- a/sledge/src/import/import.mli
+++ b/sledge/src/import/import.mli
@@ -33,7 +33,6 @@ include module type of (
 external ( == ) : 'a -> 'a -> bool = "%eq"
 
 include module type of Stdio
-module Fheap = Core_kernel.Fheap
 module Hash_queue = Core_kernel.Hash_queue
 
 (** Tuple operations *)
diff --git a/sledge/src/llair/llair.ml b/sledge/src/llair/llair.ml
index a7e480e32..b15181aaa 100644
--- a/sledge/src/llair/llair.ml
+++ b/sledge/src/llair/llair.ml
@@ -456,7 +456,7 @@ let set_derived_metadata functions =
   let compute_roots functions =
     let roots = FuncQ.create () in
     Array.iter functions ~f:(fun func ->
-        FuncQ.enqueue_exn roots func.name.var func ) ;
+        FuncQ.enqueue_back_exn roots func.name.var func ) ;
     Array.iter functions ~f:(fun func ->
         Func.fold_term func ~init:() ~f:(fun () -> function
           | Call {call= {dst}} -> (
@@ -494,7 +494,7 @@ let set_derived_metadata functions =
                 call.retreating <- true ) ;
             jump return ; Option.iter ~f:jump throw
         | Return _ | Throw _ | Unreachable -> () ) ;
-        BlockQ.enqueue_exn tips_to_roots src ()
+        BlockQ.enqueue_back_exn tips_to_roots src ()
     in
     FuncQ.iter roots ~f:(fun root ->
         visit Block_label.empty_set root root.entry ) ;