From b5d17f7f49c32e2b87856da01b51cf512c52e0e9 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Sun, 28 Sep 2025 19:39:26 +0200 Subject: [PATCH] ZAM: Drop some unneeded DeleteManagedTyped() calls The delete happens by assigning to a slot now. Seems the * and -> operators added to ZValElement correctly works with the remaining usages for RawOptField() and RawField(). --- src/script_opt/ZAM/OPs/constructors.op | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/script_opt/ZAM/OPs/constructors.op b/src/script_opt/ZAM/OPs/constructors.op index 23e7c2faaa..02fc4ac58a 100644 --- a/src/script_opt/ZAM/OPs/constructors.op +++ b/src/script_opt/ZAM/OPs/constructors.op @@ -81,8 +81,6 @@ macro AssignFromRec(rhs) if ( is_managed[i] ) { zeek::Ref(rhs_i.ManagedVal()); - if ( init_i ) - ZVal::DeleteManagedType(*init_i); } init_i = rhs_i; } @@ -166,8 +164,6 @@ macro DoManagedRecAssign(lhs, rhs) auto& lhs_i = lhs->RawOptField(lhs_map[i]); auto rhs_i = FieldValWithCheck(rhs, rhs_map[i]); zeek::Ref(rhs_i.ManagedVal()); - if ( lhs_i ) - ZVal::DeleteManagedType(*lhs_i); lhs_i = rhs_i; } else @@ -190,8 +186,6 @@ eval SetUpRecFieldOps(map) auto& lhs_i = $1->RawOptField(lhs_map[i]); auto rhs_i = FieldValWithCheck($2, rhs_map[i]); zeek::Ref(rhs_i.ManagedVal()); - if ( lhs_i ) - ZVal::DeleteManagedType(*lhs_i); lhs_i = rhs_i; }