Remove DEBUG ifdefs which broke the debug build#647
Remove DEBUG ifdefs which broke the debug build#647kroening merged 3 commits intodiffblue:masterfrom
Conversation
|
Could you also add the build to the travis build as part of this PR: |
c304ef7 to
fbdf29a
Compare
|
There's more stuff that is broken: https://travis-ci.org/diffblue/cbmc/jobs/211814527#L274 |
d8c2558 to
1fbda78
Compare
1fbda78 to
6c53036
Compare
tautschnig
left a comment
There was a problem hiding this comment.
Thanks a lot for this cleanup, and indeed we should be build-testing various #ifdef options. Several debug messages seemed rather useful - I'd ask to fix them rather than removing them.
| #ifdef DEBUG | ||
| cfg_dominators.output(std::cout); | ||
| #endif | ||
|
|
There was a problem hiding this comment.
This should be fixed rather than removed.
| std::cout << std::string(__indent, ' ') << "Parser::rDefinition 1 " << t | ||
| << "\n"; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Please fix rather than remove.
| std::cout << std::string(__indent, ' ') << "TEMPLATE_TYPE: " | ||
| << template_type << std::endl; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Please fix rather than remove.
| << "Parser::rIntegralDeclaration 8 " | ||
| << declaration << "\n"; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Please fix rather than remove.
| std::cout << std::string(__indent, ' ') << "Parser::rClassBody " << member | ||
| << std::endl; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Please fix rather than remove.
| #ifdef DEBUG | ||
| cout << "Finished symex, invoking decision procedure." << endl; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Please fix rather than remove.
| goto_programt::targett l=step.loc; | ||
| #ifdef DEBUG | ||
| std::cout << ", " << l->location_number << ":" << l->location; | ||
| #endif |
There was a problem hiding this comment.
Please fix rather than remove.
| << " accept states and " << nta.count_transitions() | ||
| << " transitions" << endl; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Please fix rather than remove.
| #ifdef DEBUG | ||
| std::cout << "There are " << init_states.size() << " init states" << endl; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Please fix rather than remove.
| << merge_into.var.start_pc + merge_into.var.length | ||
| << messaget::eom; | ||
| #endif | ||
|
|
There was a problem hiding this comment.
Please fix rather than remove.
tautschnig
left a comment
There was a problem hiding this comment.
Thanks a lot for looking at the problems in more detail - I've added a few hints on how to re-add some of the objects to be printed. This should then be ready to go after some merging of commits.
src/cpp/parse.cpp
Outdated
There was a problem hiding this comment.
It seems body and template_type have been dropped here - I think you'll need body.pretty() and template_type.pretty()
src/cpp/parse.cpp
Outdated
There was a problem hiding this comment.
I think declaration.pretty() should be re-added here.
src/cpp/parse.cpp
Outdated
There was a problem hiding this comment.
member.pretty() appears to be missing here.
src/cpp/parse.cpp
Outdated
There was a problem hiding this comment.
Could you please add << ':' << l->location.as_string()
tautschnig
left a comment
There was a problem hiding this comment.
This seems good to go save for squashing of commits (IMHO).
9c10e5c to
1a5c69d
Compare
With this commit applied, the build succeeds when invoked by
make CXXFLAGS=-DDEBUG. This is achieved by deleting anything within a#ifdef DEBUGblock which caused build errors. Several files also contained// #define DEBUGlines, which have been removed.