Skip to content

Cleanup asserts - replace with invariants #2891

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.

Sign up for GitHub

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
Sep 6, 2018
Merged

Cleanup asserts - replace with invariants #2891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d464ed
Invariant cleanup
Sep 4, 2018
f0522e7
Add missing cassert header
Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/cpp/cpp_typecheck_fargs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
#ifndef CPROVER_CPP_CPP_TYPECHECK_FARGS_H
#define CPROVER_CPP_CPP_TYPECHECK_FARGS_H

#include <cassert>

#include <util/std_code.h>

class cpp_typecheckt;
Expand Down
1 change: 0 additions & 1 deletion src/util/irep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Author: Daniel Kroening, kroening@kroening.com

#include <ostream>

#include "invariant.h"
Copy link
Contributor

@hannes-steffenhagen-diffblue hannes-steffenhagen-diffblue Sep 4, 2018

Choose a reason for hiding this comment

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

This was deleted because the corresponding header already includes invariant.h. I'm not a huge fan of this change myself, but it's not harmful.

#include "string2int.h"
#include "string_hash.h"
#include "irep_hash.h"
Expand Down
4 changes: 2 additions & 2 deletions src/util/irep.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ Author: Daniel Kroening, kroening@kroening.com
#ifndef CPROVER_UTIL_IREP_H
#define CPROVER_UTIL_IREP_H

#include <cassert>
#include <string>
#include <vector>

#include "deprecate.h"
#include "invariant.h"
Copy link
Collaborator

@tautschnig tautschnig Sep 4, 2018

Choose a reason for hiding this comment

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

Please remove the cassert header now that this move is taking place.

Copy link
Contributor Author

@sonodtt sonodtt Sep 4, 2018

Choose a reason for hiding this comment

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

Ah yes. Done. Also in other PRs.

#include "irep_ids.h"

#define SHARING
Expand Down Expand Up @@ -192,7 +192,7 @@ class irept
if(data!=&empty_d)
{
// NOLINTNEXTLINE(build/deprecated)
assert(data->ref_count!=0);
PRECONDITION(data->ref_count != 0);
data->ref_count++;
#ifdef IREP_DEBUG
std::cout << "COPY " << data << " " << data->ref_count << '\n';
Expand Down