ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for x in y where y is an "optional ok" value, but ignores #optional_allocator_error values

Browse Source
This commit is contained in:
gingerBill
2024-03-18 11:21:06 +00:00
parent 19eb2a8890
commit 43d695a990
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
+14 -8
View File
@@ -108,7 +108,7 @@ gb_internal Type *make_soa_struct_dynamic_array(CheckerContext *ctx, Ast *array_
gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 id, Type *type_hint); gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32 id, Type *type_hint);
gb_internal void check_promote_optional_ok(CheckerContext *c, Operand *x, Type **val_type_, Type **ok_type_); gb_internal void check_promote_optional_ok(CheckerContext *c, Operand *x, Type **val_type_, Type **ok_type_, bool change_operand=true);
gb_internal void check_or_else_right_type(CheckerContext *c, Ast *expr, String const &name, Type *right_type); gb_internal void check_or_else_right_type(CheckerContext *c, Ast *expr, String const &name, Type *right_type);
gb_internal void check_or_else_split_types(CheckerContext *c, Operand *x, String const &name, Type **left_type_, Type **right_type_); gb_internal void check_or_else_split_types(CheckerContext *c, Operand *x, String const &name, Type **left_type_, Type **right_type_);
@@ -7801,7 +7801,7 @@ gb_internal ExprKind check_implicit_selector_expr(CheckerContext *c, Operand *o,
} }
gb_internal void check_promote_optional_ok(CheckerContext *c, Operand *x, Type **val_type_, Type **ok_type_) { gb_internal void check_promote_optional_ok(CheckerContext *c, Operand *x, Type **val_type_, Type **ok_type_, bool change_operand) {
switch (x->mode) { switch (x->mode) {
case Addressing_MapIndex: case Addressing_MapIndex:
case Addressing_OptionalOk: case Addressing_OptionalOk:
@@ -7819,22 +7819,28 @@ gb_internal void check_promote_optional_ok(CheckerContext *c, Operand *x, Type *
Type *pt = base_type(type_of_expr(expr->CallExpr.proc)); Type *pt = base_type(type_of_expr(expr->CallExpr.proc));
if (is_type_proc(pt)) { if (is_type_proc(pt)) {
Type *tuple = pt->Proc.results; Type *tuple = pt->Proc.results;
add_type_and_value(c, x->expr, x->mode, tuple, x->value);
if (pt->Proc.result_count >= 2) { if (pt->Proc.result_count >= 2) {
if (ok_type_) *ok_type_ = tuple->Tuple.variables[1]->type; if (ok_type_) *ok_type_ = tuple->Tuple.variables[1]->type;
} }
expr->CallExpr.optional_ok_one = false; if (change_operand) {
x->type = tuple; expr->CallExpr.optional_ok_one = false;
x->type = tuple;
add_type_and_value(c, x->expr, x->mode, tuple, x->value);
}
return; return;
} }
} }
Type *tuple = make_optional_ok_type(x->type); Type *tuple = make_optional_ok_type(x->type);
if (ok_type_) *ok_type_ = tuple->Tuple.variables[1]->type; if (ok_type_) *ok_type_ = tuple->Tuple.variables[1]->type;
add_type_and_value(c, x->expr, x->mode, tuple, x->value);
x->type = tuple; if (change_operand) {
GB_ASSERT(is_type_tuple(type_of_expr(x->expr))); add_type_and_value(c, x->expr, x->mode, tuple, x->value);
x->type = tuple;
GB_ASSERT(is_type_tuple(type_of_expr(x->expr)));
}
} }
src/check_stmt.cpp
+5 -1
View File
@@ -1544,7 +1544,11 @@ gb_internal void check_range_stmt(CheckerContext *ctx, Ast *node, u32 mod_flags)
} }
} else if (operand.mode != Addressing_Invalid) { } else if (operand.mode != Addressing_Invalid) {
if (operand.mode == Addressing_OptionalOk || operand.mode == Addressing_OptionalOkPtr) { if (operand.mode == Addressing_OptionalOk || operand.mode == Addressing_OptionalOkPtr) {
check_promote_optional_ok(ctx, &operand, nullptr, nullptr); Type *end_type = nullptr;
check_promote_optional_ok(ctx, &operand, nullptr, &end_type, false);
if (is_type_boolean(end_type)) {
check_promote_optional_ok(ctx, &operand, nullptr, &end_type, true);
}
} }
bool is_ptr = is_type_pointer(operand.type); bool is_ptr = is_type_pointer(operand.type);
Type *t = base_type(type_deref(operand.type)); Type *t = base_type(type_deref(operand.type));