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

SV-COMP 24 fixes #176

Merged
merged 6 commits into from
Oct 12, 2024
Merged

SV-COMP 24 fixes #176

merged 6 commits into from
Oct 12, 2024

Conversation

FrNecas
Copy link
Contributor

@FrNecas FrNecas commented Nov 21, 2023

This PR introduces various small fixes required for SV-COMP 2024:

  • fixes for building with GCC 13
  • ignore longjmp in competition mode
  • ignore cos/sin/exp and similar functions in competition mode

@FrNecas
Copy link
Contributor Author

FrNecas commented Nov 24, 2023

We should merge peterschrammel/cbmc#29 before this so that the submodule doesn't point to my dev branch

@peterschrammel
Copy link
Member

done

The warnings (errors due to -Werror) are coming from CBMC. The issue has
been introduced in gcc 13 and is now fixed on CBMC develop branch in
commit 3a6cef0 which can't be cleanly applied to the version that 2LS is
currently using. With no current plans to migrate to C++-20, we can
ignore the warning for now.
The API is different across the various template generators and the
method is always called directly on the given template generator type,
i.e. in a non-virtual way. Therefore, there is no need to implement this
method as virtual.
@FrNecas
Copy link
Contributor Author

FrNecas commented Nov 24, 2023

I've noticed that our clang-format config for breaking after bracket wasn't consistent with the code style, hence the linting errors. Hopefully should be passing now.

@FrNecas FrNecas marked this pull request as ready for review November 24, 2023 17:46
Copy link
Collaborator

@viktormalik viktormalik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a nit, otherwise LGTM. Thanks!

@@ -22,6 +22,8 @@ Author: Peter Schrammel

#include "2ls_parse_options.h"

#define NOT_MATH_FUN(call, fun) call != fun &&call != fun "f" && call != fun "l"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing space, is that enforced by clang-format?

Suggested change
#define NOT_MATH_FUN(call, fun) call != fun &&call != fun "f" && call != fun "l"
#define NOT_MATH_FUN(call, fun) call != fun && call != fun "f" && call != fun "l"

@peterschrammel peterschrammel merged commit 9a9ad37 into diffblue:master Oct 12, 2024
3 checks passed
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