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

Bump Z3 to v4.12.1 #2565

Merged
merged 3 commits into from
May 24, 2023
Merged

Bump Z3 to v4.12.1 #2565

merged 3 commits into from
May 24, 2023

Conversation

thpani
Copy link
Collaborator

@thpani thpani commented May 22, 2023

Bump Z3 to v4.12.1

Unblocks #2140

@thpani thpani requested review from konnov and Kukovec May 22, 2023 11:10
@thpani thpani requested a review from shonfeder as a code owner May 22, 2023 11:10
@thpani thpani self-assigned this May 22, 2023
@thpani thpani enabled auto-merge (squash) May 22, 2023 11:12
@codecov-commenter
Copy link

codecov-commenter commented May 22, 2023

Codecov Report

Merging #2565 (6c6e5f3) into main (4853612) will decrease coverage by 0.01%.
The diff coverage is n/a.

❗ Current head 6c6e5f3 differs from pull request most recent head 5e30fa0. Consider uploading reports for the commit 5e30fa0 to get more accurate results

@@            Coverage Diff             @@
##             main    #2565      +/-   ##
==========================================
- Coverage   78.52%   78.51%   -0.01%     
==========================================
  Files         445      445              
  Lines       15617    15617              
  Branches     2550     2550              
==========================================
- Hits        12263    12262       -1     
- Misses       3354     3355       +1     

see 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@thpani thpani disabled auto-merge May 22, 2023 15:12
@thpani
Copy link
Collaborator Author

thpani commented May 23, 2023

So... on top of the Z3 version bump, I had to nix flake update to fix CI errors:

nix was pulling in glibc-2.33-50, but z3-turnkey is now built against glibc-2.34.
This lead to the following error in CI integration tests:

+java.lang.UnsatisfiedLinkError: /tmp/z3-turnkey17148880360307759062/libz3.so: /nix/store/mij848h2x5wiqkwhg027byvmf9x3gx7y-glibc-2.33-50/lib/libc.so.6: version `GLIBC_2.34' not found (required by /tmp/z3-turnkey17148880360307759062/libz3.so)

Since glibc-2.34 was released in 2021, it doesn't seem excessive to update.

@thpani
Copy link
Collaborator Author

thpani commented May 23, 2023

However, this now pulls in an updated mdx, which contains this regression: realworldocaml/mdx#428

Essentially, this messes with Apalache's > indented output.

@thpani thpani force-pushed the th/bump-z3 branch 2 times, most recently from 2bf6a16 to 8c458d5 Compare May 23, 2023 14:31
thpani added a commit that referenced this pull request May 24, 2023
Update the nix flake lock file.

This fixes the outdated glibc version, as described here:
#2565 (comment)

I updated to a fixed revision from Jan 2023, to pull in an old version of ocaml-mdx.
This is a workaround for the following regressions in later versions of mdx:
realworldocaml/mdx#428

To update nix flake inputs to a specific revision, I ran:

    nix flake update --override-input nixpkgs github:NixOS/nixpkgs/<rev>
thpani added a commit that referenced this pull request May 24, 2023
Update the nix flake lock file.

This fixes the outdated glibc version, as described here:
#2565 (comment)

I updated to a fixed revision from Jan 2023, to pull in an old version of ocaml-mdx.
This is a workaround for the following regressions in later versions of mdx:
realworldocaml/mdx#428

To update nix flake inputs to a specific revision, I ran:

    nix flake update --override-input nixpkgs github:NixOS/nixpkgs/<rev>
@thpani
Copy link
Collaborator Author

thpani commented May 24, 2023

Pinning nixpkgs at rev 76be8d2d04a00e5e2df6fa147dfc4797874edc97 gets us the right versions of mdx and glibc, but now GCC's libstdc++ has the wrong version:

+java.lang.UnsatisfiedLinkError: /tmp/z3-turnkey9780953678439786526/libz3.so: /nix/store/sq78g74zs4sj7n1j5709g9c2pmffx1y8-gcc-11.3.0-lib/lib/libstdc++.so.6: version `GLIBCXX_3.4.30' not found (required by /tmp/z3-turnkey9780Please report an issue at [https://github.com/informalsystems/apalache/issues]: java.lang.UnsatisfiedLinkError: /tmp/z3-turnkey9780953678439786526/libz3.so: /nix/store/sq78g74zs4sj7n1j5709g9c2pmffx1y8-gcc-11.3.0-lib/lib/libstdc++.so.6: version `GLIBCXX_3.4.30' not found (required by /tmp/z3-turnkey9780953678439786526/libz3.so)

GLIBCXX_3.4.30 is supported from GCC 12.1 on.

@thpani thpani force-pushed the th/bump-z3 branch 2 times, most recently from 01f1a23 to 5cc08ca Compare May 24, 2023 12:12
@thpani thpani merged commit ae175f6 into main May 24, 2023
@thpani thpani deleted the th/bump-z3 branch May 24, 2023 13:15
@apalache-bot apalache-bot mentioned this pull request May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants