wip

GaloisInc · Oct 8, 2021 · 30b4b69 · 30b4b69
1 parent e3036b3
commit 30b4b69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/s2nTests/docker/awslc.dockerfile b/s2nTests/docker/awslc.dockerfile
@@ -7,7 +7,7 @@ WORKDIR /saw-script
 RUN mkdir -p /saw-script && \
     git clone https://github.com/GaloisInc/aws-lc-verification.git && \
     cd aws-lc-verification && \
-    git checkout 0e55a079cf53187bf4bf8e4548f7fd885a004899 && \
+    git checkout 7cadddf46bf90dae86034bb6f929fab805f867b9 && \
     git config --file=.gitmodules submodule.src.url https://github.com/awslabs/aws-lc && \
     git submodule sync && \
     git submodule update --init

diff --git a/src/SAWScript/Crucible/LLVM/Override.hs b/src/SAWScript/Crucible/LLVM/Override.hs
@@ -1091,10 +1091,7 @@ matchArg ::
   OverrideMatcher (LLVM arch) md ()
 
 matchArg opts sc cc cs prepost actual expectedTy expected = do
-  let mvar = Crucible.llvmMemVar (ccLLVMContext cc)
-  mem <- case Crucible.lookupGlobal mvar $ cc ^. ccLLVMGlobals of
-    Nothing -> fail "internal error: LLVM Memory global not found"
-    Just mem -> pure mem
+  mem <- readGlobal $ Crucible.llvmMemVar $ ccLLVMContext cc
   case (actual, expectedTy, expected) of
     (_, _, SetupTerm expectedTT)
       | TypedTermSchema (Cryptol.Forall [] [] tyexpr) <- ttType expectedTT