From 7c95f5d874e5f3a0ad0e57794eea30fe203ee37d Mon Sep 17 00:00:00 2001
From: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Thu, 26 Aug 2021 08:31:28 -0400
Subject: [PATCH] Adapt to crucible-symio and even more MemOptions (#225)

This bumps the `crucible` submodule to bring in:

* `crucible-symio` (GaloisInc/crucible#788). This requires adding a new
  project dependency in `cabal.project.dist`.
* GaloisInc/crucible#808, which adds yet another `?memOpts :: MemOptions`
  constraint, this time in `doPtrAddOffset`.
---
 cabal.project.dist                         | 1 +
 deps/crucible                              | 2 +-
 symbolic/src/Data/Macaw/Symbolic/Memory.hs | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cabal.project.dist b/cabal.project.dist
index e3da59e8..8f6721d5 100644
--- a/cabal.project.dist
+++ b/cabal.project.dist
@@ -26,6 +26,7 @@ packages: base/
           deps/dismantle/dismantle-thumb/
           deps/crucible/crucible/
           deps/crucible/crucible-llvm/
+          deps/crucible/crucible-symio/
           deps/what4/what4/
           deps/what4-serialize/
           deps/dwarf/
diff --git a/deps/crucible b/deps/crucible
index 9cfcc7b6..01154760 160000
--- a/deps/crucible
+++ b/deps/crucible
@@ -1 +1 @@
-Subproject commit 9cfcc7b6322a39d9cef496ad5979efceb32d418a
+Subproject commit 011547602d8fe40a22434b460038e0021e0b216a
diff --git a/symbolic/src/Data/Macaw/Symbolic/Memory.hs b/symbolic/src/Data/Macaw/Symbolic/Memory.hs
index 2b5c7dca..a7f79ad9 100644
--- a/symbolic/src/Data/Macaw/Symbolic/Memory.hs
+++ b/symbolic/src/Data/Macaw/Symbolic/Memory.hs
@@ -479,6 +479,7 @@ mapRegionPointers :: ( MC.MemWidth w
                      , 16 <= w
                      , CB.IsSymInterface sym
                      , CL.HasLLVMAnn sym
+                     , ?memOpts :: CL.MemOptions
                      )
                   => MemPtrTable sym w
                   -> MS.GlobalMap sym CL.Mem w