Add a function to remove attributes from trees

src/cgen.c

@@ -6343,17 +6343,9 @@ static void cgen_cleanup_tmp_attrs(tree_t top)
    for (int i = 0; i < ndecls; i++) {
       tree_t d = tree_decl(top, i);
 
-      if (tree_attr_ptr(d, local_var_i))
-         tree_add_attr_ptr(d, local_var_i, NULL);
-
-      if (tree_attr_ptr(d, global_const_i))
-         tree_add_attr_ptr(d, global_const_i, NULL);
-
-      if (tree_attr_ptr(d, sig_nets_i))
-         tree_add_attr_ptr(d, sig_nets_i, NULL);
-
-      if (tree_attr_ptr(d, llvm_agg_i))
-         tree_add_attr_ptr(d, llvm_agg_i, NULL);
+      tree_remove_attr(d, local_var_i);
+      tree_remove_attr(d, global_const_i);
+      tree_remove_attr(d, sig_nets_i);
    }
 }
 

src/tree.c

@@ -1707,6 +1707,24 @@ static attr_t *tree_add_attr(tree_t t, ident_t name, attr_kind_t kind)
    return &(t->attrs.table[i]);
 }
 
+void tree_remove_attr(tree_t t, ident_t name)
+{
+   assert(t != NULL);
+   assert(name != NULL);
+
+   unsigned i;
+   for (i = 0; (i < t->attrs.num) && (t->attrs.table[i].name != name); i++)
+      ;
+
+   if (i == t->attrs.num)
+      return;
+
+   for (; i + 1 < t->attrs.num; i++)
+      t->attrs.table[i] = t->attrs.table[i + 1];
+
+   t->attrs.num--;
+}
+
 void tree_add_attr_str(tree_t t, ident_t name, ident_t str)
 {
    tree_add_attr(t, name, A_STRING)->sval = str;

src/tree.h

@@ -282,6 +282,7 @@ void tree_add_attr_ptr(tree_t t, ident_t name, void *ptr);
 void *tree_attr_ptr(tree_t t, ident_t name);
 tree_t tree_attr_tree(tree_t t, ident_t name);
 void tree_add_attr_tree(tree_t t, ident_t name, tree_t val);
+void tree_remove_attr(tree_t t, ident_t name);
 
 typedef void (*tree_visit_fn_t)(tree_t t, void *context);
 unsigned tree_visit(tree_t t, tree_visit_fn_t fn, void *context);