Skip to content

Conversation

@FrNecas
Copy link

@FrNecas FrNecas commented Oct 11, 2021

@peterschrammel this is a fix for SVcomp, the same change that we had in our fork was applied in the develop branch ( see diffblue#5660 ) so it is no longer necessary. Reverting for now, we can drop these commits if we later rebase to a newer version.

@FrNecas FrNecas requested a review from martin-cs as a code owner October 15, 2021 10:57
@FrNecas
Copy link
Author

FrNecas commented Oct 15, 2021

One more bug uncovered, memcleanup instrumentation was not done, the function_identifier param was always set to __CPROVER_start due to inlining.

@viktormalik
Copy link

One more bug uncovered, memcleanup instrumentation was not done, the function_identifier param was always set to __CPROVER_start due to inlining.

You should probably rename the PR.

@FrNecas FrNecas changed the title Revert "Witnesses: add the 'creationtime' attribute" SVcomp-22 fixes Oct 15, 2021
@FrNecas FrNecas changed the title SVcomp-22 fixes SV-COMP 22 fixes Oct 15, 2021
@FrNecas
Copy link
Author

FrNecas commented Oct 24, 2021

One more fix added related to nontermination witnesses.

This reverts commit 40046b2. A commit
achieving the same thing is already present in CBMC causing duplication
of the attribute.
If inlining is performed, the function_identifier parameter will always
be __CPROVER_start. However, the former function is still stored in the
goto instruction and can be sued for the instrumentation

Signed-off-by: František Nečas <[email protected]>
This was previously commented out but was dropped in the rebase by
accident (the code was moved and merge conflict not correctly resolved).
This is necessary for some nontermination witnesses to function
correctly.

Signed-off-by: František Nečas <[email protected]>
@FrNecas FrNecas force-pushed the frnecas-svcomp-fixes branch from cef5c19 to 36c8f77 Compare November 18, 2021 14:04
@FrNecas
Copy link
Author

FrNecas commented Nov 18, 2021

Rebased to the current state of target branch. Lets see the results of one more pre-run and we can probably merge this if everything goes well :)

@viktormalik
Copy link

@peterschrammel this should be ready, could you merge it, please? Thanks!

@peterschrammel peterschrammel merged commit ddf6447 into peterschrammel:2ls-prerequisites-cbmc-5.37.0 Jan 14, 2022
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