JBMC: run convert-nondet on a per-function basis #1738
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This converts functions from conventional to via-global-variable return style on a function-by-function basis. It results in some complication, as the globals are now seen by the language's final pass, meaning it must ignore them for initialisation purposes, and we must cope with functions not having their "true" type while other functions are still being loaded. One test in cbmc-java failed because it was written in C, which we don't adapt to support incremental loading yet, so it is moved to the cbmc test directory, where it can still achieve its goal of checking whether uncaught_exceptions_analysist can tolerate CPROVER_assert and similar builtins, since cbmc also runs the remove_exceptions pass.
smowton
requested review from
cesaro,
kroening,
mgudemann,
peterschrammel,
tautschnig and
thk123
as code owners
src/goto-programs/convert_nondet.h
Outdated
| /// Replace calls to nondet library functions with an internal nondet | ||
| /// representation. | ||
| /// \param function: goto program to modify | ||
| /// \param symbol_table: The symbol table to query/update. |
src/jbmc/jbmc_parse_options.cpp
Outdated
|
|
||
| // Similar removal of java nondet statements: | ||
| // TODO Should really get this from java_bytecode_language somehow, but we | ||
| // don't have an instance of that here. |
There was a problem hiding this comment.
Pffff... (I know this code was already there)... we really have to upgrade optionst so that parsing can happen on setting values.
smowton
force-pushed
the
smowton/feature/convert_nondet_per_function
branch
from
61a9faf to
4059e3d
Compare
|
Subsumed by #1740 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A trivial switch from a whole-program to a per-function pass. Depends on #1737; only review the latest commit.