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.

Sign up for GitHub

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

Check the tree like invariant #498

Merged
merged 4 commits into from
Oct 27, 2021
Merged

Check the tree like invariant #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0f2dc9
Check the tree-like invariant in PLE.
facundominguez Oct 23, 2021
07e45cf
Have sendConcreteBindingsToSMT pass the state from the continuation
facundominguez Oct 4, 2021
6ea3c59
Remove redundant constraint from sinfoToFInfo
facundominguez Oct 6, 2021
1902323
Use a VM in CI instead of docker images
facundominguez Oct 27, 2021
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
23 changes: 12 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,36 @@ version: 2.0

jobs:
build:
docker:
- image: fpco/stack-build:lts-16.8
machine:
image: ubuntu-2004:202107-02
steps:
- run: sudo apt-get update && sudo apt-get install -y curl git ssh unzip wget libtinfo-dev gcc make
- add_ssh_keys
- run:
name: Install z3
command: |
wget https://github.com/Z3Prover/z3/releases/download/z3-4.8.7/z3-4.8.7-x64-ubuntu-16.04.zip
unzip z3-4.8.7-x64-ubuntu-16.04.zip
rm -f z3-4.8.7-x64-ubuntu-16.04.zip
cp z3-4.8.7-x64-ubuntu-16.04/bin/libz3.a /usr/local/lib
cp z3-4.8.7-x64-ubuntu-16.04/bin/z3 /usr/local/bin
cp z3-4.8.7-x64-ubuntu-16.04/include/* /usr/local/include
sudo cp z3-4.8.7-x64-ubuntu-16.04/bin/libz3.a /usr/local/lib
sudo cp z3-4.8.7-x64-ubuntu-16.04/bin/z3 /usr/local/bin
sudo cp z3-4.8.7-x64-ubuntu-16.04/include/* /usr/local/include
rm -rf z3-4.8.7-x64-ubuntu-16.04
z3 --version

- checkout
- restore_cache:
keys:
- stack-{{ checksum "stack.yaml" }}-{{ checksum "liquid-fixpoint.cabal" }}
- stack-{{ checksum "stack.yaml" }}
- stack-cache-v1-{{ checksum "stack.yaml" }}-{{ checksum "liquid-fixpoint.cabal" }}
- stack-cache-v1-{{ checksum "stack.yaml" }}
- run:
name: Dependencies
command: |
wget -qO- https://get.haskellstack.org/ | sudo sh
stack --no-terminal setup
stack --no-terminal build -j2 liquid-fixpoint --only-dependencies --test --no-run-tests
- save_cache:
key: stack-{{ checksum "stack.yaml" }}-{{ checksum "liquid-fixpoint.cabal" }}
key: stack-cache-v1-{{ checksum "stack.yaml" }}-{{ checksum "liquid-fixpoint.cabal" }}
paths:
- ~/.stack
- ./.stack-work
Expand All @@ -43,10 +45,9 @@ jobs:
command: |
mkdir -p /tmp/junit
stack --no-terminal test -j2 liquid-fixpoint:test --flag liquid-fixpoint:devel --test-arguments="--xml=/tmp/junit/main-test-results.xml":
stack --no-terminal haddock --flag liquid-fixpoint:devel
stack --no-terminal sdist
stack --no-terminal haddock --flag liquid-fixpoint:devel --test --no-run-tests --no-haddock-deps --haddock-arguments="--no-print-missing-docs"
# mkdir -p $CIRCLE_TEST_REPORTS/tasty
# cp -r tests/logs/cur $CIRCLE_TEST_REPORTS/tasty/log
- run:
name: Dist
command: stack sdist
command: stack --no-terminal sdist
6 changes: 4 additions & 2 deletions src/Language/Fixpoint/Solver/Monad.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,13 @@ sendConcreteBindingsToSMT known act = do
, not (F.memberIBindEnv i known)
]
st <- get
withContext $ \me -> do
(a, st') <- withContext $ \me -> do
smtBracket me "" $ do
forM_ concretePreds $ \(i, e) ->
smtDefineFunc me (F.bindSymbol (fromIntegral i)) [] F.boolSort e
flip evalStateT st $ act $ F.unionIBindEnv known $ F.fromListIBindEnv $ map fst concretePreds
flip runStateT st $ act $ F.unionIBindEnv known $ F.fromListIBindEnv $ map fst concretePreds
put st'
return a
where
isShortExpr F.PTrue = True
isShortExpr F.PTop = True
Expand Down
2 changes: 1 addition & 1 deletion src/Language/Fixpoint/Solver/PLE.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ updCtxRes res iMb ctx = (ctx, res')


updRes :: InstRes -> Maybe BindId -> Expr -> InstRes
updRes res (Just i) e = M.insert i e res
updRes res (Just i) e = M.insertWith (error "tree-like invariant broken in ple. See https://github.com/ucsd-progsys/liquid-fixpoint/issues/496") i e res
updRes res Nothing _ = res

----------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/Language/Fixpoint/Types/Constraints.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ outVV (m, fi) i c = (m', fi')

type BindM = M.HashMap Integer BindId

sinfoToFInfo :: Fixpoint a => SInfo a -> FInfo a
sinfoToFInfo :: SInfo a -> FInfo a
sinfoToFInfo fi = fi
{ bs = envWithoutLhss
, cm = simpcToSubc (bs fi) <$> cm fi
Expand Down