From 76a38caf34a691b0fab5e39a8d6a9872c25b3cb5 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 6 Jul 2020 12:22:23 -0700 Subject: [PATCH] Fix WhileStmt to call Stmt(Tag) ctor Also removed Stmt() default ctor to help ensure derived classes initialize the Stmt tag (and other members). --- src/Stmt.cc | 3 ++- src/Stmt.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Stmt.cc b/src/Stmt.cc index 8d12e3b93e..3d1ace8b95 100644 --- a/src/Stmt.cc +++ b/src/Stmt.cc @@ -1001,7 +1001,8 @@ TraversalCode EventStmt::Traverse(TraversalCallback* cb) const WhileStmt::WhileStmt(ExprPtr arg_loop_condition, StmtPtr arg_body) - : loop_condition(std::move(arg_loop_condition)), body(std::move(arg_body)) + : Stmt(STMT_WHILE), + loop_condition(std::move(arg_loop_condition)), body(std::move(arg_body)) { if ( ! loop_condition->IsError() && ! IsBool(loop_condition->GetType()->Tag()) ) diff --git a/src/Stmt.h b/src/Stmt.h index 881a042836..f2886846c6 100644 --- a/src/Stmt.h +++ b/src/Stmt.h @@ -66,7 +66,6 @@ public: virtual TraversalCode Traverse(TraversalCallback* cb) const = 0; protected: - Stmt() {} explicit Stmt(BroStmtTag arg_tag); void AddTag(ODesc* d) const;