mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-01 19:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug: Disallow non-specialized polymorphic in typeid assignment

Browse Source
This commit is contained in:
gingerBill
2023-09-06 17:33:38 +01:00
parent c660b43105
commit aaaff9b66c
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/check_expr.cpp
View File

@@ -629,6 +629,9 @@ gb_internal i64 check_distance_between_types(CheckerContext *c, Operand *operand
if (operand->mode == Addressing_Type) {
if (is_type_typeid(type)) {
if (is_type_polymorphic(operand->type)) {
return -1;
}
add_type_info_type(c, operand->type);
return 4;
}
@@ -1118,10 +1121,17 @@ gb_internal void check_assignment(CheckerContext *c, Operand *operand, Type *typ
LIT(context_name));
break;
case Addressing_Type:
error(operand->expr,
"Cannot assign '%s' which is a type in %.*s",
op_type_str,
LIT(context_name));
if (is_type_polymorphic(operand->type)) {
error(operand->expr,
"Cannot assign '%s' which is a polymorphic type in %.*s",
op_type_str,
LIT(context_name));
} else {
error(operand->expr,
"Cannot assign '%s' which is a type in %.*s",
op_type_str,
LIT(context_name));
}
break;
default:
// TODO(bill): is this a good enough error message?

7
src/checker.cpp
View File

@@ -1922,6 +1922,12 @@ gb_internal void add_type_info_type_internal(CheckerContext *c, Type *t) {
for_array(i, bt->Union.variants) {
add_type_info_type_internal(c, bt->Union.variants[i]);
}
if (bt->Union.scope != nullptr) {
for (auto const &entry : bt->Union.scope->elements) {
Entity *e = entry.value;
add_type_info_type_internal(c, e->type);
}
}
break;
case Type_Struct:
@@ -2265,7 +2271,6 @@ gb_internal void add_dependency_to_set(Checker *c, Entity *entity) {
if (decl == nullptr) {
return;
}
for (Type *t : decl->type_info_deps) {
add_min_dep_type_info(c, t);
}

7
src/llvm_backend_const.cpp
View File

@@ -1094,8 +1094,11 @@ gb_internal lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bo
}
if (is_constant) {
LLVMValueRef elem_value = lb_const_value(m, tav.type, tav.value, allow_local).value;
GB_ASSERT(LLVMIsConstant(elem_value));
values[index] = LLVMConstInsertValue(values[index], elem_value, idx_list, idx_list_len);
if (LLVMIsConstant(elem_value)) {
values[index] = LLVMConstInsertValue(values[index], elem_value, idx_list, idx_list_len);
} else {
is_constant = false;
}
}
}
}