mirror of
https://github.com/odin-lang/Odin.git
synced 2026-04-19 21:10:30 +00:00
Merge pull request #5770 from harold-b/hb.fix-objc-superclass-check
Fix `@objc_superclass` attribute crashing when referenced type was invalid
This commit is contained in:
@@ -559,6 +559,11 @@ gb_internal void check_type_decl(CheckerContext *ctx, Entity *e, Ast *init_expr,
|
||||
|
||||
Type *super = ac.objc_superclass;
|
||||
while (super != nullptr) {
|
||||
if (super->kind != Type_Named) {
|
||||
error(e->token, "@(objc_superclass) Referenced type must be a named struct");
|
||||
break;
|
||||
}
|
||||
|
||||
if (type_set_update(&super_set, super)) {
|
||||
error(e->token, "@(objc_superclass) Superclass hierarchy cycle encountered");
|
||||
break;
|
||||
@@ -566,11 +571,6 @@ gb_internal void check_type_decl(CheckerContext *ctx, Entity *e, Ast *init_expr,
|
||||
|
||||
check_single_global_entity(ctx->checker, super->Named.type_name, super->Named.type_name->decl_info);
|
||||
|
||||
if (super->kind != Type_Named) {
|
||||
error(e->token, "@(objc_superclass) Referenced type must be a named struct");
|
||||
break;
|
||||
}
|
||||
|
||||
Type* named_type = base_named_type(super);
|
||||
GB_ASSERT(named_type->kind == Type_Named);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user