Browse Source

Merge pull request #5770 from harold-b/hb.fix-objc-superclass-check

Fix `@objc_superclass` attribute crashing when referenced type was invalid
Laytan 4 days ago
parent
commit
f564f66c03
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/check_decl.cpp

+ 5 - 5
src/check_decl.cpp

@@ -559,6 +559,11 @@ gb_internal void check_type_decl(CheckerContext *ctx, Entity *e, Ast *init_expr,
 
 
 				Type *super = ac.objc_superclass;
 				Type *super = ac.objc_superclass;
 				while (super != nullptr) {
 				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)) {
 					if (type_set_update(&super_set, super)) {
 						error(e->token, "@(objc_superclass) Superclass hierarchy cycle encountered");
 						error(e->token, "@(objc_superclass) Superclass hierarchy cycle encountered");
 						break;
 						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);
 					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);
 					Type* named_type = base_named_type(super);
 					GB_ASSERT(named_type->kind == Type_Named);
 					GB_ASSERT(named_type->kind == Type_Named);