introduce 'called_function' into goto traces [blocks: #3126] #3276
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
kroening
requested review from
peterschrammel,
pkesseli,
smowton and
tautschnig
as code owners
tautschnig
approved these changes
Nov 5, 2018
smowton
approved these changes
Nov 5, 2018
src/goto-programs/goto_trace.cpp
Outdated
| @@ -483,7 +485,7 @@ void show_full_goto_trace( | |||
| function_depth--; | |||
| if(options.show_function_calls) | |||
| { | |||
| out << "\n#### Function return: " << step.function_identifier | |||
| out << "\n#### Function return" | |||
src/goto-programs/goto_trace.h
Outdated
| @@ -86,6 +86,8 @@ class goto_trace_stept | |||
| enum class assignment_typet { STATE, ACTUAL_PARAMETER }; | |||
| assignment_typet assignment_type; | |||
|
|
|||
| // the instruction that created this step | |||
There was a problem hiding this comment.
Clarify that calls are outside a function and returns inside it?
src/goto-programs/xml_goto_trace.cpp
Outdated
| "display_name", id2string(symbol.display_name())); | ||
| xml_function.set_attribute( | ||
| "identifier", id2string(symbol.name)); | ||
| xml_function.new_element()=xml(symbol.location); |
src/goto-programs/xml_goto_trace.cpp
Outdated
| xmlt &xml_function=xml_call_return.new_element("function"); | ||
| xml_function.set_attribute( | ||
| "display_name", id2string(symbol.display_name())); | ||
| xml_function.set_attribute( | ||
| "identifier", id2string(step.function_identifier)); | ||
| "identifier", id2string(symbol.name)); |
There was a problem hiding this comment.
step.function a little clearer?
kroening
force-pushed
the
called_function
branch
8 times, most recently
from
94624ae to
cac61bb
Compare
tautschnig
changed the title
added 3 commits
November 7, 2018 11:57
The previous 'function_identifier' is now 'called_function', which is a better name as it denotes the identifier of the function that is called.
kroening
force-pushed
the
called_function
branch
from
cac61bb to
05eb134
Compare
allredj
reviewed
Nov 7, 2018
There was a problem hiding this comment.
🚫
This PR failed Diffblue compatibility checks (cbmc commit: 05eb134).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/90559178
Status will be re-evaluated on next push.
Please contact @peterschrammel, @thk123, or @allredj for support.
Common spurious failures:
- the cbmc commit has disappeared in the mean time (e.g. in a force-push)
- the author is not in the list of contributors (e.g. first-time contributors).
The incompatibility may have been introduced by an earlier PR. In that case merging this
PR should be avoided unless it fixes the current incompatibility.
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.
This will support removing the function identifier from goto instructions.