Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some additional LLVM intrinsics #290

Merged
merged 4 commits into from
Aug 12, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
squash warnings
  • Loading branch information
robdockins committed Aug 12, 2019
commit 6f11fbb3d47eb8db466e52b8e88bdefa521f937d
1 change: 1 addition & 0 deletions crucible-llvm/src/Lang/Crucible/LLVM/Intrinsics/.#Libc.hs
1 change: 0 additions & 1 deletion crucible-llvm/src/Lang/Crucible/LLVM/MemModel/Common.hs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import Data.Vector (Vector)
import qualified Data.Vector as V

import Lang.Crucible.LLVM.Bytes
import Lang.Crucible.LLVM.DataLayout
import Lang.Crucible.LLVM.MemModel.Type

-- | @R i j@ denotes that the write should store in range [i..j).
Expand Down
4 changes: 2 additions & 2 deletions crucible-llvm/src/Lang/Crucible/LLVM/MemModel/Generic.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1587,8 +1587,8 @@ possibleAllocs n = helper . memAllocs
if base == n
then [SomeAlloc atp base sz mut alignment loc]
else []
AllocMerge (asConstantPred -> Just True) as1 as2 -> helper as1
AllocMerge (asConstantPred -> Just False) as1 as2 -> helper as2
AllocMerge (asConstantPred -> Just True) as1 _as2 -> helper as1
AllocMerge (asConstantPred -> Just False) _as1 as2 -> helper as2
AllocMerge _ as1 as2 -> helper as1 ++ helper as2

-- | Check if @LLVMPtr sym w@ points inside an allocation that is backed
Expand Down