odb: simplify code for destructibe fields

Signed-off-by: Felipe Garay <fgaray@google.com>
fgaray · Nov 21, 2023 · 5199285 · 5199285
1 parent fbb3099
commit 5199285
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/odb/src/codeGenerator/gen.py b/src/odb/src/codeGenerator/gen.py
@@ -264,10 +264,8 @@ def get_json_files(directory):
         else:
             field["setterArgumentType"] = field["getterReturnType"] = field["type"]
 
-        if field["name"] == '_name' and 'no-destruct' not in field["flags"]:
-          klass["has_destructible_fields"] = True
-
-        if "table" in field:
+        # For fields that we need to free/destroy in the destructor
+        if field["name"] == '_name' and 'no-destruct' not in field["flags"] or "table" in field:
           klass["has_destructible_fields"] = True
 
     klass["fields"] = [field for field in klass["fields"] if "bits" not in field]