From 806eee8e99fbbd86f01b62b4306bd48f1cd3c872 Mon Sep 17 00:00:00 2001 From: Martin Wickham Date: Thu, 30 Sep 2021 23:38:41 -0500 Subject: Fix abortAnonDecl() --- src/Module.zig | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/Module.zig') diff --git a/src/Module.zig b/src/Module.zig index 07ebb0823c..60dea31d18 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -4064,9 +4064,19 @@ pub fn deleteUnusedDecl(mod: *Module, decl: *Decl) void { pub fn abortAnonDecl(mod: *Module, decl: *Decl) void { log.debug("abortAnonDecl {*} ({s})", .{ decl, decl.name }); - assert(decl.namespace.anon_decls.swapRemove(decl)); - assert(decl.dependants.count() == 0); - assert(decl.dependencies.count() == 0); + + const owner_namespace = if (decl.namespace.getDecl() == decl and decl.namespace.parent != null) decl.namespace.parent.? else decl.namespace; + assert(owner_namespace.anon_decls.swapRemove(decl)); + + const dependants = decl.dependants.keys(); + for (dependants) |dep| { + dep.removeDependency(decl); + } + + for (decl.dependencies.keys()) |dep| { + dep.removeDependant(decl); + } + decl.destroy(mod); } -- cgit v1.2.3