From 3498d4341d27d3ddb7f5dc6013d58a7db3bece25 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Wed, 2 Oct 2024 15:07:22 +0100 Subject: Fix #4330 --- src/check_decl.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/check_decl.cpp') diff --git a/src/check_decl.cpp b/src/check_decl.cpp index 3b532a727..0cc89435d 100644 --- a/src/check_decl.cpp +++ b/src/check_decl.cpp @@ -232,6 +232,10 @@ gb_internal bool check_override_as_type_due_to_aliasing(CheckerContext *ctx, Ent // until there is a proper delaying system to try declaration again if they // have failed. + if (e->type != nullptr && is_type_typed(e->type)) { + return false; + } + e->kind = Entity_TypeName; check_type_decl(ctx, e, init, named_type); return true; -- cgit v1.2.3 From 01c7380df8b2c42da103ce93e0bd8631ace8ad12 Mon Sep 17 00:00:00 2001 From: Misomosi Date: Sun, 20 Oct 2024 22:45:30 -0400 Subject: Fix #4390 by assigning invalid entity type --- src/check_decl.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/check_decl.cpp') diff --git a/src/check_decl.cpp b/src/check_decl.cpp index 0cc89435d..60eb030ff 100644 --- a/src/check_decl.cpp +++ b/src/check_decl.cpp @@ -88,11 +88,12 @@ gb_internal Type *check_init_variable(CheckerContext *ctx, Entity *e, Operand *o e->type = t_invalid; return nullptr; } else if (is_type_polymorphic(t)) { - Entity *e = entity_of_node(operand->expr); - if (e == nullptr) { + Entity *e2 = entity_of_node(operand->expr); + if (e2 == nullptr) { + e->type = t_invalid; return nullptr; } - if (e->state.load() != EntityState_Resolved) { + if (e2->state.load() != EntityState_Resolved) { gbString str = type_to_string(t); defer (gb_string_free(str)); error(e->token, "Invalid use of a polymorphic type '%s' in %.*s", str, LIT(context_name)); -- cgit v1.2.3