Skip to content

simplify the remove_exceptions API #3288

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 1 commit into from
Nov 9, 2018
Merged

Conversation

kroening
Copy link
Member

@kroening kroening commented Nov 7, 2018

This removes the usage of a pointer an the potential to call the variant
that does remove_instanceof without class hierarchy.

  • 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.
  • 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).
  • n/a 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.

}

/// removes throws/CATCH-POP/CATCH-PUSH
void remove_exceptions_and_instanceof(
Copy link
Contributor

Choose a reason for hiding this comment

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

Name not really accurate; this should only affect the newly introduced instanceof instructions, not existing ones

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, will flip naming around.


/// Removes 'throw x' and CATCH-PUSH/CATCH-POP
/// and adds the required instrumentation (GOTOs and assignments)
/// Any instanceof expressions are expanded.
Copy link
Contributor

Choose a reason for hiding this comment

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

Any new instanceof instructions

@kroening kroening force-pushed the remove_exceptions_ptr branch from 813c523 to 0cdc1f0 Compare November 7, 2018 11:32
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: 0cdc1f0).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/90551420
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.

Copy link
Member

@peterschrammel peterschrammel left a comment

Choose a reason for hiding this comment

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

@thk123, @allredj, this is going to break TG, but trivial to fix.

This removes the usage of a pointer an the potential to call the variant
that does remove_instanceof without class hierarchy.
@kroening kroening force-pushed the remove_exceptions_ptr branch from 0cdc1f0 to 902cc69 Compare November 8, 2018 07:57
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: 902cc69).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/90679994
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.

@tautschnig
Copy link
Collaborator

Please rebase to re-trigger the bot.

@thk123
Copy link
Contributor

thk123 commented Nov 9, 2018

I wouldn't bother - this needs a manual bump, I believe @allredj is looking at this.

@tautschnig
Copy link
Collaborator

Marked do-not-merge and assigned to @allredj.

@allredj
Copy link
Contributor

allredj commented Nov 9, 2018

Test-gen PR is here: https://github.com/diffblue/test-gen/pull/2457. Will notify when passing.

@allredj
Copy link
Contributor

allredj commented Nov 9, 2018

TG bump passing. Good to merge.

@tautschnig tautschnig merged commit d3d3cdb into develop Nov 9, 2018
@tautschnig tautschnig deleted the remove_exceptions_ptr branch November 9, 2018 17:13
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.

6 participants