Skip to content

remove goto_programt::instructiont::function member [blocks: #3113] #3126

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
Feb 4, 2019

Conversation

kroening
Copy link
Member

@kroening kroening commented Oct 9, 2018

  • Each commit message has a non-empty body, explaining why the change was made.
  • My contribution is formatted in line with CODING_STANDARD.md.
  • Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • 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).
  • 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.

Copy link
Collaborator

@tautschnig tautschnig left a comment

Choose a reason for hiding this comment

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

If we can actually do this then that's great, but it will require some more work.

///
/// \param p: the goto program
/// \return id of the function that contains the goto program
static const irep_idt get_function_id(
Copy link
Collaborator

Choose a reason for hiding this comment

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

This function is actually used and thus any of its call-sites need to be modified.

@martin-cs
Copy link
Collaborator

@chrisr-diffblue : something gives me a feeling this may break a branch you maintain for a customer. You might want to check.

@kroening
Copy link
Member Author

kroening commented Oct 9, 2018

@tautschnig There will be a few places where the name of the function currently looked at will have to be passed down the call-tree; but I don't expect that many.

@kroening kroening force-pushed the goto-instruction-function branch from 9c87e96 to d1eae28 Compare October 9, 2018 10:21
@kroening kroening force-pushed the goto-instruction-function branch from d1eae28 to 8812e2d Compare October 9, 2018 21:10
@kroening kroening force-pushed the goto-instruction-function branch 3 times, most recently from d0c7f41 to dfae80c Compare October 10, 2018 11:00
@kroening kroening force-pushed the goto-instruction-function branch 2 times, most recently from cc078b5 to 7036a99 Compare October 14, 2018 22:41
@kroening kroening force-pushed the goto-instruction-function branch from 7036a99 to 16c6c32 Compare November 5, 2018 14:19
@tautschnig tautschnig changed the title remove goto_programt::instructiont::function member remove goto_programt::instructiont::function member [blocks: #3113] Nov 7, 2018
@kroening kroening force-pushed the goto-instruction-function branch 2 times, most recently from cb12035 to 45611eb Compare November 7, 2018 12:44
@tautschnig tautschnig assigned thk123 and allredj and unassigned chrisr-diffblue Jan 31, 2019
@tautschnig
Copy link
Collaborator

It seems this finally passes on CBMC and has all the approvals, but as expected it fails with TG. @allredj @peterschrammel @thk123 Could you please figure out whether that work can be scheduled? I have no idea how much effort that is...

@thk123
Copy link
Contributor

thk123 commented Feb 1, 2019

Creating a bump for this now.

@thk123
Copy link
Contributor

thk123 commented Feb 1, 2019

@kroening Could I get this rebased to create the bump.

@tautschnig tautschnig force-pushed the goto-instruction-function branch from 0e9e01e to 787409d Compare February 1, 2019 12:23
@tautschnig
Copy link
Collaborator

@thk123 rebased.

@thk123
Copy link
Contributor

thk123 commented Feb 1, 2019

@tautschnig And now failing CI here 😞

@tautschnig tautschnig force-pushed the goto-instruction-function branch from 787409d to 5c5f9fe Compare February 1, 2019 16:28
@tautschnig
Copy link
Collaborator

Err, sure ... @thk123 should be fixed now.

@thk123
Copy link
Contributor

thk123 commented Feb 1, 2019

TG bump created - will let you know when it passes.

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

🚫
This PR failed Diffblue compatibility checks (cbmc commit: 5c5f9fe).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/99459448
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.

@thk123
Copy link
Contributor

thk123 commented Feb 4, 2019

TG bump is passing on this 👍

This member is being removed, there is nothing to validate about it.
@tautschnig
Copy link
Collaborator

Thanks @thk123, I will rebase and then merge.

Daniel Kroening and others added 2 commits February 4, 2019 14:35
We no longer need to change an instruction's function member, but should update
the source location instead.
@tautschnig tautschnig force-pushed the goto-instruction-function branch from 5c5f9fe to 8ddd9ba Compare February 4, 2019 14:43
@tautschnig tautschnig merged commit 4adcfd8 into develop Feb 4, 2019
@tautschnig tautschnig deleted the goto-instruction-function branch February 4, 2019 17:16
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

🚫
This PR failed Diffblue compatibility checks (cbmc commit: 8ddd9ba).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/99659348
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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants