Skip to content

Refactor trace loop heads #5406

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

Merged
merged 3 commits into from
Jul 9, 2020
Merged

Conversation

thk123
Copy link
Contributor

@thk123 thk123 commented Jul 2, 2020

Refactoring of the common code for producing the location only steps. Feedback welcome. The goal here is to try and force the JSON and XML traces to be structurally the same

  • Each commit message has a non-empty body, explaining why the change was made.
  • Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • [na] The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • [na] My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • White-space or formatting changes outside the feature-related changed lines are in commits of their own.

@thk123 thk123 force-pushed the refactor-trace-loop-heads branch 2 times, most recently from 18c3eed to f4a832e Compare July 2, 2020 15:31
@codecov
Copy link

codecov bot commented Jul 2, 2020

Codecov Report

Merging #5406 into develop will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #5406      +/-   ##
===========================================
- Coverage    68.19%   68.19%   -0.01%     
===========================================
  Files         1176     1177       +1     
  Lines        97527    97531       +4     
===========================================
+ Hits         66511    66512       +1     
- Misses       31016    31019       +3     
Flag Coverage Δ
#cproversmt2 42.73% <100.00%> (-0.01%) ⬇️
#regression 65.37% <100.00%> (-0.01%) ⬇️
#unit 32.25% <30.76%> (+<0.01%) ⬆️
Impacted Files Coverage Δ
src/goto-programs/json_goto_trace.cpp 81.57% <100.00%> (ø)
src/goto-programs/json_goto_trace.h 90.32% <100.00%> (-0.59%) ⬇️
src/goto-programs/structured_trace_util.cpp 80.00% <100.00%> (-7.50%) ⬇️
src/goto-programs/structured_trace_util.h 100.00% <100.00%> (ø)
src/goto-programs/xml_goto_trace.cpp 98.26% <100.00%> (-0.03%) ⬇️
src/util/json.cpp 82.66% <0.00%> (-1.34%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1f1de48...f639b89. Read the comment docs.

Copy link
Contributor

@smowton smowton left a comment

Choose a reason for hiding this comment

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

To check: is there already regression test coverage?

// location of a sequence of same locations.
// However, we don't want to suppress loop head locations because
// they might come from different loop iterations. If we suppressed
// them it would be impossible to know in which loop iteration
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo "in which loop" -> "which loop"

@thk123
Copy link
Contributor Author

thk123 commented Jul 3, 2020

@smowton Yup - this is a refactoring of a feature introduced in #5381

@thk123
Copy link
Contributor Author

thk123 commented Jul 3, 2020

The codecov reduction is because I made a file smaller, but the lines I removed were covered 😢 - the diff is 100% covered

Thomas Kiley added 3 commits July 3, 2020 09:57
This models the logic for whether a trace step should be included away
from whether the format is json or XML
@thk123 thk123 force-pushed the refactor-trace-loop-heads branch from f4a832e to f639b89 Compare July 3, 2020 08:57
@thk123 thk123 merged commit 0c08382 into diffblue:develop Jul 9, 2020
@thk123 thk123 deleted the refactor-trace-loop-heads branch July 9, 2020 15:28
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