From d1d9460575b5f06383a8dd3dd42cc94266a88de3 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sun, 7 Jan 2024 10:00:19 +0000 Subject: [PATCH] Only call simplify_global once in elab_instance --- src/elab.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/elab.c b/src/elab.c index 35fb4157..2c56b39f 100644 --- a/src/elab.c +++ b/src/elab.c @@ -1317,21 +1317,15 @@ static void elab_instance(tree_t t, const elab_ctx_t *ctx) elab_context(arch_copy); elab_generics(entity, comp, t, &new_ctx); elab_instance_fixup(arch_copy, &new_ctx); - simplify_global(entity, new_ctx.generics, ctx->jit, ctx->registry); + simplify_global(arch_copy, new_ctx.generics, ctx->jit, ctx->registry); elab_ports(entity, comp, t, &new_ctx); elab_decls(entity, &new_ctx); - if (error_count() == 0) { - diag_add_hint_fn(elab_hint_fn, t); - simplify_global(arch_copy, new_ctx.generics, ctx->jit, ctx->registry); - new_ctx.drivers = find_drivers(arch_copy); - diag_remove_hint_fn(elab_hint_fn); - } - if (error_count() == 0) elab_decls(arch_copy, &new_ctx); if (error_count() == 0) { + new_ctx.drivers = find_drivers(arch_copy); elab_lower(b, &new_ctx); elab_stmts(entity, &new_ctx); elab_stmts(arch_copy, &new_ctx); -- 2.39.2