diff --git a/src/compiler/compiler_internal.h b/src/compiler/compiler_internal.h index 300e348e4..06dfef66d 100644 --- a/src/compiler/compiler_internal.h +++ b/src/compiler/compiler_internal.h @@ -3091,7 +3091,7 @@ INLINE const char *type_invalid_storage_type_name(Type *type) INLINE Type *enum_inner_type(Type *enum_type) { - assert(enum_type->type_kind == TYPE_ENUM || enum_type->type_kind == TYPE_CONST_ENUM); + assert(enum_type->type_kind == TYPE_ENUM || enum_type->type_kind == TYPE_CONSTDEF); return enum_type->decl->enums.type_info->type; } diff --git a/src/compiler/enums.h b/src/compiler/enums.h index eb9855b08..52cfc1609 100644 --- a/src/compiler/enums.h +++ b/src/compiler/enums.h @@ -1214,7 +1214,7 @@ typedef enum INTROSPECT_TYPE_ANYFAULT = 6, INTROSPECT_TYPE_ANY = 7, INTROSPECT_TYPE_ENUM = 8, - INTROSPECT_TYPE_CONST_ENUM = 9, + INTROSPECT_TYPE_CONSTDEF = 9, INTROSPECT_TYPE_STRUCT = 10, INTROSPECT_TYPE_UNION = 11, INTROSPECT_TYPE_BITSTRUCT = 12, diff --git a/src/compiler/llvm_codegen_expr.c b/src/compiler/llvm_codegen_expr.c index b1630897c..3e5cad891 100644 --- a/src/compiler/llvm_codegen_expr.c +++ b/src/compiler/llvm_codegen_expr.c @@ -6618,7 +6618,7 @@ static inline void llvm_emit_typeid_info(GenContext *c, BEValue *value, Expr *ex INTROSPECT_TYPE_ARRAY, INTROSPECT_TYPE_POINTER, INTROSPECT_TYPE_VECTOR, INTROSPECT_TYPE_ENUM, INTROSPECT_TYPE_SLICE, INTROSPECT_TYPE_DISTINCT, - INTROSPECT_TYPE_CONST_ENUM, INTROSPECT_TYPE_BITSTRUCT, + INTROSPECT_TYPE_CONSTDEF, INTROSPECT_TYPE_BITSTRUCT, INTROSPECT_TYPE_OPTIONAL, }; for (int i = 0; i < 8; i++) diff --git a/src/compiler/llvm_codegen_type.c b/src/compiler/llvm_codegen_type.c index 2ef683ed3..835c3041d 100644 --- a/src/compiler/llvm_codegen_type.c +++ b/src/compiler/llvm_codegen_type.c @@ -644,7 +644,7 @@ LLVMValueRef llvm_get_typeid(GenContext *c, Type *type) case TYPE_ENUM: return llvm_get_introspection_for_enum(c, type); case TYPE_CONSTDEF: - return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_CONST_ENUM, type_inline(type), vec_size(type->decl->enums.values), NULL, false); + return llvm_generate_introspection_global(c, NULL, type, INTROSPECT_TYPE_CONSTDEF, type_inline(type), vec_size(type->decl->enums.values), NULL, false); case TYPE_STRUCT: case TYPE_UNION: return llvm_get_introspection_for_struct_union(c, type); diff --git a/src/compiler/types.c b/src/compiler/types.c index fa145757b..ec4cb1f3e 100644 --- a/src/compiler/types.c +++ b/src/compiler/types.c @@ -2352,7 +2352,7 @@ unsigned type_get_introspection_kind(TypeKind kind) case TYPE_ENUM: return INTROSPECT_TYPE_ENUM; case TYPE_CONSTDEF: - return INTROSPECT_TYPE_CONST_ENUM; + return INTROSPECT_TYPE_CONSTDEF; case TYPE_FUNC_PTR: return INTROSPECT_TYPE_FUNC; case TYPE_STRUCT: