ZAM ignores new "assert" statement

src/Stmt.h

@@ -558,6 +558,9 @@ public:
 	// Optimization-related:
 	StmtPtr Duplicate() override;
 
+	bool IsReduced(Reducer* c) const override;
+	StmtPtr DoReduce(Reducer* c) override;
+
 private:
 	ExprPtr cond;
 	ExprPtr msg;

src/script_opt/Stmt.cc

@@ -924,6 +924,16 @@ StmtPtr AssertStmt::Duplicate()
 	return SetSucc(new AssertStmt(cond->Duplicate(), msg ? msg->Duplicate() : nullptr));
 	}
 
+bool AssertStmt::IsReduced(Reducer* c) const
+	{
+	return false;
+	}
+
+StmtPtr AssertStmt::DoReduce(Reducer* c)
+	{
+	return make_intrusive<NullStmt>();
+	}
+
 StmtPtr WhenStmt::Duplicate()
 	{
 	FuncType::CaptureList* cl_dup = nullptr;

testing/btest/Baseline/language.assert-hook/.stderr

@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/assert-hook.zeek, line 15: assertion failure: 1 != 1
+error in <...>/assert-hook.zeek, line 18: assertion failure: 1 != 1

testing/btest/Baseline/language.assert-hook/out

@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-assertion_failure, 1 != 1, , <...>/assert-hook.zeek, 15
+assertion_failure, 1 != 1, , <...>/assert-hook.zeek, 18

testing/btest/Baseline/language.assert-top-level/.stderr

@@ -1,3 +1,3 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/assert-top-level.zeek, line 5: assertion failure: getpid() == 0 (my pid greater 0? T)
+error in <...>/assert-top-level.zeek, line 7: assertion failure: getpid() == 0 (my pid greater 0? T)
 fatal error: failed to execute script statements at top-level scope

testing/btest/Baseline/language.assert/out

@@ -1,3 +1,3 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/assert.zeek, line 8: assertion failure: fmt("%s", 1) == "2"
+error in <...>/assert.zeek, line 11: assertion failure: fmt("%s", 1) == "2"
 fatal error: errors occurred while initializing

testing/btest/language/assert-hook.zeek

@@ -1,5 +1,8 @@
 # @TEST-DOC: Assert statement testing with assertion_failure and assertion_result implementation.
 #
+# Doesn't make sense for ZAM as it ignores assert's.
+# @TEST-REQUIRES: test "${ZEEK_ZAM}" != "1"
+#
 # @TEST-EXEC: zeek -b %INPUT >out
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr

testing/btest/language/assert-misc.zeek

@@ -1,5 +1,8 @@
 # @TEST-DOC: Test Describe() of assert statement. Expressions may be canonicalized.
 #
+# Doesn't make sense for ZAM as it ignores assert's.
+# @TEST-REQUIRES: test "${ZEEK_ZAM}" != "1"
+#
 # @TEST-EXEC: zeek -b %INPUT >out 2>&1
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
 

testing/btest/language/assert-top-level.zeek

@@ -1,3 +1,5 @@
+# Doesn't make sense for ZAM as it ignores assert's.
+# @TEST-REQUIRES: test "${ZEEK_ZAM}" != "1"
 # @TEST-EXEC-FAIL: zeek -b %INPUT >out
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
 

testing/btest/language/assert.zeek

@@ -1,5 +1,8 @@
 # @TEST-DOC: Assert statement behavior testing without an assertion_failure() hook.
 #
+# Doesn't make sense for ZAM as it ignores assert's.
+# @TEST-REQUIRES: test "${ZEEK_ZAM}" != "1"
+#
 # @TEST-EXEC-FAIL: unset ZEEK_ALLOW_INIT_ERRORS; zeek -b %INPUT >out 2>&1
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out