Merge remote-tracking branch 'origin/topic/vern/CPP-maint.May25'

* origin/topic/vern/CPP-maint.May25:
  minor BTest maintenance updates for -O gen-C++
  fix for more robustly finding BTests to assess for -O gen-C++
  fix for -O gen-C++ dealing with type constants of unnamed compound types

CHANGES

@@ -1,3 +1,11 @@
+8.0.0-dev.307 | 2025-06-02 10:12:14 +0200
+
+  * minor BTest maintenance updates for -O gen-C++ (Vern Paxson, Corelight)
+
+  * fix for more robustly finding BTests to assess for -O gen-C++ (Vern Paxson, Corelight)
+
+  * fix for -O gen-C++ dealing with type constants of unnamed compound types (Vern Paxson, Corelight)
+
 8.0.0-dev.303 | 2025-06-02 09:51:53 +0200
 
   * intel/seen/manage-event-groups: Policy script for toggling intel event groups (Arne Welzel, Corelight)

VERSION

@@ -1 +1 @@
-8.0.0-dev.303
+8.0.0-dev.307

src/script_opt/CPP/InitsInfo.cc

@@ -299,9 +299,12 @@ void FuncConstInfo::InitializerVals(std::vector<std::string>& ivs) const {
     }
 }
 
-void TypeConstInfo::InitializerVals(std::vector<std::string>& ivs) const {
+TypeConstInfo::TypeConstInfo(CPPCompile* _c, ValPtr v) : CompoundItemInfo(_c, v) {
-    auto& t = tv->GetType()->AsTypeType()->GetType();
+    auto tv = v->AsTypeVal();
-    ivs.emplace_back(Fmt(t->Tag()));
+    auto t = tv->GetType()->AsTypeType()->GetType();
+    auto gi = c->RegisterType(t);
+    type = c->TypeOffset(t);
+    init_cohort = max(init_cohort, gi->InitCohort() + 1);
 }
 
 AttrInfo::AttrInfo(CPPCompile* _c, const AttrPtr& attr) : CompoundItemInfo(_c) {

src/script_opt/CPP/InitsInfo.h

@@ -469,12 +469,7 @@ private:
 
 class TypeConstInfo : public CompoundItemInfo {
 public:
-    TypeConstInfo(CPPCompile* _c, ValPtr v) : CompoundItemInfo(_c, v), tv(v->AsTypeVal()) {}
+    TypeConstInfo(CPPCompile* _c, ValPtr v);
-
-    void InitializerVals(std::vector<std::string>& ivs) const override;
-
-private:
-    TypeVal* tv;
 };
 
 // Initialization information for single attributes and sets of attributes.

src/script_opt/CPP/RuntimeInits.cc

@@ -154,8 +154,7 @@ void CPP_IndexedInits<T>::Generate(InitsManager* im, std::vector<FuncValPtr>& iv
 template<class T>
 void CPP_IndexedInits<T>::Generate(InitsManager* im, std::vector<TypeValPtr>& ivec, int offset,
                                    ValElemVec& init_vals) const {
-    auto bt = base_type(static_cast<TypeTag>(init_vals[0]));
+    auto t = make_intrusive<TypeType>(im->Types(init_vals[0]));
-    auto t = make_intrusive<TypeType>(bt);
     ivec[offset] = make_intrusive<TypeVal>(t);
 }
 

src/script_opt/CPP/maint/find-test-files.sh

@@ -4,7 +4,7 @@ find ../testing/btest -type f |
     grep -v '\.tmp/' |
     xargs grep -E -l '@TEST' |
     xargs grep -E -l '^[ 	]*(event|print)' |
-    xargs grep -E -c 'REQUIRES.*CPP.*((!=.*1)|(==.*0))' |
+    xargs grep -E -c '(REQUIRES.*CPP.*((!=.*1)|(==.*0)))|@TEST-START-NEXT' |
     grep ':0$' |
     sed 's,:0,,' |
     sort

testing/btest/Baseline.cpp/cluster.websocket.listen-idempotent/.stderr

@@ -0,0 +1,5 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error in <...>/listen-idempotent.zeek (C++), line 9: Already listening on 127.0.0.1:<port> (<___>testing_btest__tmp_cluster_websocket_listen_idempotent_listen_idempotent_zeek__zeek_init__36__zf: function() : void())
+error in <...>/listen-idempotent.zeek (C++), line 9: Already listening on 127.0.0.1:<port> (<___>testing_btest__tmp_cluster_websocket_listen_idempotent_listen_idempotent_zeek__zeek_init__36__zf: function() : void())
+error in <...>/listen-idempotent.zeek (C++), line 9: Already listening on 127.0.0.1:<port> (<___>testing_btest__tmp_cluster_websocket_listen_idempotent_listen_idempotent_zeek__zeek_init__36__zf: function() : void())
+received termination signal

testing/btest/Baseline.cpp/cluster.websocket.tls-usage-error/.stderr

@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error in <...>/tls-usage-error.zeek (C++), line 7: Invalid tls_options: No key_file field (<___>testing_btest__tmp_cluster_websocket_tls_usage_error_tls_usage_error_zeek__zeek_init__36__zf: function() : void())
+error in <...>/tls-usage-error.zeek (C++), line 7: Invalid tls_options: No cert_file field (<___>testing_btest__tmp_cluster_websocket_tls_usage_error_tls_usage_error_zeek__zeek_init__36__zf: function() : void())

testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-PORT: BROKER_MANAGER_PORT
 # @TEST-PORT: BROKER_WORKER1_PORT
 # @TEST-PORT: BROKER_LOGGER1_PORT

testing/btest/scripts/base/frameworks/config/cluster_resend.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-PORT: BROKER_MANAGER_PORT
 # @TEST-PORT: BROKER_WORKER1_PORT
 # @TEST-PORT: BROKER_WORKER2_PORT

testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-PORT: BROKER_MANAGER_PORT
 # @TEST-PORT: BROKER_WORKER1_PORT
 #

testing/btest/scripts/base/frameworks/logging/field-extension-cluster.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-PORT: BROKER_MANAGER_PORT
 # @TEST-PORT: BROKER_WORKER1_PORT
 #

testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-PORT: BROKER_MANAGER_PORT
 # @TEST-PORT: BROKER_WORKER1_PORT
 # @TEST-PORT: BROKER_WORKER2_PORT

testing/btest/scripts/base/frameworks/openflow/log-cluster.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-PORT: BROKER_MANAGER_PORT
 # @TEST-PORT: BROKER_WORKER1_PORT
 #

testing/btest/scripts/base/frameworks/storage/sqlite-cluster.zeek

@@ -1,4 +1,5 @@
 # @TEST-DOC: Tests SQLite storage in a cluster environment
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 
 # @TEST-PORT: BROKER_MANAGER_PORT
 # @TEST-PORT: BROKER_WORKER1_PORT