Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/vern/stmt-line-numbers'

Browse source 
* origin/topic/vern/stmt-line-numbers:
  maintenance updates for ZAM BiF-tracking
  fix line numbers associated with "if" and initialization statements

(cherry picked from commit c0a863cba0)
This commit is contained in:
Arne Welzel 2025-08-17 17:28:59 +02:00 • committed by Tim Wojtulewicz
parent 7fdb266b24
commit 69dc9209b5
6 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGES
View file

@ -1,3 +1,17 @@
8.0.0-rc2.4 | 2025-08-18 16:36:59 +0000
* Merge remote-tracking branch 'origin/topic/vern/stmt-line-numbers' (Arne Welzel, Corelight)
* origin/topic/vern/stmt-line-numbers:
maintenance updates for ZAM BiF-tracking
fix line numbers associated with "if" and initialization statements
(cherry picked from commit c0a863cba0896f860a0c44ce0ff668c21267c239)
* Fix ci/update-zeekygen-docs to agree with ruff-format (Tim Wojtulewicz, Corelight)
* Bump auxil/spicy to spicy-1.14.0 (Benjamin Bannier, Corelight)
8.0.0-rc2 | 2025-08-12 12:42:54 -0700
* Release 8.0.0-rc2.

2
VERSION
View file

@ -1 +1 @@
8.0.0-rc2
8.0.0-rc2.4

6
src/Stmt.cc
View file

@ -426,10 +426,6 @@ IfStmt::IfStmt(ExprPtr test, StmtPtr arg_s1, StmtPtr arg_s2)
: ExprStmt(STMT_IF, std::move(test)), s1(std::move(arg_s1)), s2(std::move(arg_s2)) {
if ( ! e->IsError() && ! IsBool(e->GetType()->Tag()) )
e->Error("conditional in test must be boolean");
const Location* loc1 = s1->GetLocationInfo();
const Location* loc2 = s2->GetLocationInfo();
SetLocationInfo(loc1, loc2);
}
IfStmt::~IfStmt() = default;
@ -1488,7 +1484,7 @@ InitStmt::InitStmt(std::vector<IDPtr> arg_inits) : Stmt(STMT_INIT) {
inits = std::move(arg_inits);
if ( ! inits.empty() )
SetLocationInfo(inits[0]->GetLocationInfo());
SetLocationInfo(inits.front()->GetLocationInfo(), inits.back()->GetLocationInfo());
}
ValPtr InitStmt::Exec(Frame* f, StmtFlowType& flow) {

5
src/script_opt/FuncInfo.cc
View file

@ -117,7 +117,7 @@ static std::unordered_map<std::string, unsigned int> func_attrs = {
{"Option::set_change_handler", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"PacketAnalyzer::GTPV1::remove_gtpv1_connection", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"PacketAnalyzer::Geneve::get_options", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"PacketAnalyzer::PPPoE::session_id", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"PacketAnalyzer::PPPoE::session_id", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"PacketAnalyzer::TEREDO::remove_teredo_connection", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"PacketAnalyzer::__disable_analyzer", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"PacketAnalyzer::__enable_analyzer", ATTR_NO_SCRIPT_SIDE_EFFECTS},
@ -162,6 +162,7 @@ static std::unordered_map<std::string, unsigned int> func_attrs = {
{"Storage::Sync::__get", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"Storage::Sync::__open_backend", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"Storage::Sync::__put", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"Storage::is_forced_sync", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"Supervisor::__create", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"Supervisor::__destroy", ATTR_NO_SCRIPT_SIDE_EFFECTS},
{"Supervisor::__is_supervised", ATTR_IDEMPOTENT},
@ -301,6 +302,7 @@ static std::unordered_map<std::string, unsigned int> func_attrs = {
{"get_net_stats", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"get_orig_seq", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"get_package_readme", ATTR_FOLDABLE},
{"get_plugin_components", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"get_port_transport_proto", ATTR_FOLDABLE},
{"get_proc_stats", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"get_reassembler_stats", ATTR_NO_ZEEK_SIDE_EFFECTS},
@ -318,7 +320,6 @@ static std::unordered_map<std::string, unsigned int> func_attrs = {
{"global_ids", ATTR_IDEMPOTENT},
{"global_options", ATTR_IDEMPOTENT},
{"gsub", ATTR_FOLDABLE},
{"get_plugin_components", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"has_event_group", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"has_module_events", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"have_spicy", ATTR_IDEMPOTENT},

2
testing/btest/Baseline/opt.ZAM-bif-tracking/output
View file

@ -1,2 +1,2 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
564 seen BiFs, 0 unseen BiFs (), 0 new BiFs ()
566 seen BiFs, 0 unseen BiFs (), 0 new BiFs ()

6
testing/btest/opt/ZAM-bif-tracking.zeek
View file

@ -150,6 +150,7 @@ global known_BiFs = set(
"Option::set_change_handler",
"PacketAnalyzer::GTPV1::remove_gtpv1_connection",
"PacketAnalyzer::Geneve::get_options",
"PacketAnalyzer::PPPoE::session_id",
"PacketAnalyzer::TEREDO::remove_teredo_connection",
"PacketAnalyzer::__disable_analyzer",
"PacketAnalyzer::__enable_analyzer",
@ -184,7 +185,6 @@ global known_BiFs = set(
"Reporter::warning",
"Spicy::__resource_usage",
"Spicy::__toggle_analyzer",
"Storage::is_open",
"Storage::Async::__close_backend",
"Storage::Async::__erase",
"Storage::Async::__get",
@ -195,6 +195,8 @@ global known_BiFs = set(
"Storage::Sync::__get",
"Storage::Sync::__open_backend",
"Storage::Sync::__put",
"Storage::is_forced_sync",
"Storage::is_open",
"Supervisor::__create",
"Supervisor::__destroy",
"Supervisor::__is_supervised",
@ -337,6 +339,7 @@ global known_BiFs = set(
"get_net_stats",
"get_orig_seq",
"get_package_readme",
"get_plugin_components",
"get_port_transport_proto",
"get_proc_stats",
"get_reassembler_stats",
@ -345,7 +348,6 @@ global known_BiFs = set(
"get_reporter_stats",
"get_resp_seq",
"get_script_comments",
"get_plugin_components",
"get_thread_stats",
"get_timer_stats",
"getenv",