Skip to content

Do not instrument built-ins #292

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 2 commits into from
May 12, 2017

Conversation

peterschrammel
Copy link
Member

fixes #259

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.

The "typo" commit may not be appropriate; other comments are minor, and a rebase is necessary.

@@ -1375,9 +1390,10 @@ void instrument_cover_goals(
Forall_goto_functions(f_it, goto_functions)
{
if(f_it->first==ID__start ||
f_it->first=="__CPROVER_initialize")
f_it->first=="__CPROVER_initialize" ||
Copy link
Collaborator

Choose a reason for hiding this comment

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

Use CPROVER_PREFIX "initialize" (and #include <util/cprover_prefix.h>) [yes, there are ~2000 other locations where that should get fixed]

@@ -185,7 +185,7 @@ void remove_returnst::do_function_calls(
t_a->code=code_assignt(function_call.lhs(), rhs);
t_a->function=i_it->function;

// fry the previous assignment
// try the previous assignment
Copy link
Collaborator

Choose a reason for hiding this comment

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

I do not think that was a typo!?

@tautschnig tautschnig assigned peterschrammel and unassigned kroening Feb 1, 2017
@tautschnig
Copy link
Collaborator

I think this PR might need some rework as we've now got a different way of determining built-ins.

@peterschrammel peterschrammel force-pushed the do-not-instrument-built-ins branch 7 times, most recently from 815ec19 to 4e43a15 Compare April 4, 2017 15:16
@peterschrammel
Copy link
Member Author

@tautschnig, fixed.

@peterschrammel peterschrammel force-pushed the do-not-instrument-built-ins branch from 4e43a15 to a1ac2ec Compare April 4, 2017 21:09
@tautschnig
Copy link
Collaborator

@peterschrammel Would you mind rebasing to get all fixes from master such as to repair the AppVeyor failure? The irep_ids merge teaches me that we should have all tests succeed before accepting. Thanks!

@peterschrammel peterschrammel force-pushed the do-not-instrument-built-ins branch from a1ac2ec to 0c5b645 Compare April 6, 2017 12:33
@tautschnig
Copy link
Collaborator

It seems a large number of tests have blank lines. I'm working on a PR to remedy this.

@peterschrammel
Copy link
Member Author

How are tests with blank lines related to this PR?

@peterschrammel
Copy link
Member Author

Rebasing...

@peterschrammel peterschrammel force-pushed the do-not-instrument-built-ins branch from 0c5b645 to 9dacdb1 Compare April 6, 2017 13:57
@tautschnig
Copy link
Collaborator

The blank lines weren't related - current master is/was still broken...

@peterschrammel peterschrammel force-pushed the do-not-instrument-built-ins branch from 9dacdb1 to 12d6582 Compare April 8, 2017 14:02
@peterschrammel
Copy link
Member Author

@tautschnig, all green now.

@kroening kroening merged commit bab30f9 into diffblue:master May 12, 2017
smowton added a commit to smowton/cbmc that referenced this pull request May 9, 2018
Merge latest cbmc/develop into cbmc subtree
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.

3 participants