Skip to content
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

Jump to bottom

clean up override warning for NDEBUG builds #351

Merged
merged 1 commit into from
Mar 9, 2017
Merged

clean up override warning for NDEBUG builds #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions ir/visitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,21 +344,24 @@ bool ControlFlowVisitor::join_flows(const IR::Node *n) {
return false;
}

void Inspector::check_clone(const Visitor *v) {
bool Inspector::check_clone(const Visitor *v) {
auto *t = dynamic_cast<const Inspector *>(v);
BUG_CHECK(t && t->visited == visited, "Clone failed to copy base object");
return true;
}
void Modifier::check_clone(const Visitor *v) {
bool Modifier::check_clone(const Visitor *v) {
auto *t = dynamic_cast<const Modifier *>(v);
BUG_CHECK(t && t->visited == visited, "Clone failed to copy base object");
return true;
}
void Transform::check_clone(const Visitor *v) {
bool Transform::check_clone(const Visitor *v) {
auto *t = dynamic_cast<const Transform *>(v);
BUG_CHECK(t && t->visited == visited, "Clone failed to copy base object");
return true;
}

ControlFlowVisitor &ControlFlowVisitor::flow_clone() {
auto *rv = clone();
rv->check_clone(this);
assert(rv->check_clone(this));
return *rv;
}
11 changes: 4 additions & 7 deletions ir/visitor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,7 @@ class Visitor {
virtual bool join_flows(const IR::Node *) { return false; }
void visit_children(const IR::Node *, std::function<void()> fn) { fn(); }
class ChangeTracker; // used by Modifier and Transform -- private to them
#ifndef NDEBUG
virtual // making this non-virtual for NDEBUG builds turns it into a noop
#endif
void check_clone(const Visitor *) {}
virtual bool check_clone(const Visitor *) { return true; }

private:
virtual void visitor_const_error();
Expand All @@ -182,7 +179,7 @@ class Visitor {
class Modifier : public virtual Visitor {
ChangeTracker *visited = nullptr;
void visitor_const_error() override;
void check_clone(const Visitor *) override;
bool check_clone(const Visitor *) override;
public:
profile_t init_apply(const IR::Node *root) override;
const IR::Node *apply_visitor(const IR::Node *n, const char *name = 0) override;
Expand All @@ -201,7 +198,7 @@ class Modifier : public virtual Visitor {
class Inspector : public virtual Visitor {
typedef unordered_map<const IR::Node *, bool> visited_t;
visited_t *visited = nullptr;
void check_clone(const Visitor *) override;
bool check_clone(const Visitor *) override;
public:
profile_t init_apply(const IR::Node *root) override;
const IR::Node *apply_visitor(const IR::Node *, const char *name = 0) override;
Expand All @@ -221,7 +218,7 @@ class Transform : public virtual Visitor {
ChangeTracker *visited = nullptr;
bool prune_flag = false;
void visitor_const_error() override;
void check_clone(const Visitor *) override;
bool check_clone(const Visitor *) override;

public:
profile_t init_apply(const IR::Node *root) override;
Expand Down