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

Merge pull request #7460 from kalsprite/const_truncation_sweep

Browse Source 
convert constants before narrowing to i64 in the remaining checker sites
This commit is contained in:
gingerBill
2026-08-26 08:39:48 +01:00
committed by GitHub
parent f1a348616a 7e9ffac5b0
commit 4c0e5dfdc8
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/check_builtin.cpp
View File

@@ -5230,6 +5230,12 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
operand->type = t_invalid;
return false;
}
convert_to_typed(c, &x, t_int);
if (x.mode == Addressing_Invalid) {
operand->mode = Addressing_Type;
operand->type = t_invalid;
return false;
}
i64 count = big_int_to_i64(&x.value.value_integer);
check_expr_or_type(c, &y, ce->args[1]);
@@ -7710,6 +7716,12 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
return false;
}
convert_to_typed(c, &x, t_int);
if (x.mode == Addressing_Invalid) {
operand->mode = Addressing_Type;
operand->type = t_invalid;
return false;
}
i64 index = big_int_to_i64(&x.value.value_integer);
if (index < 0 || index >= u->Union.variants.count) {
error(call, "Variant tag out of bounds index for '%.*s", LIT(builtin_name));

19
src/check_stmt.cpp
View File

@@ -954,14 +954,17 @@ gb_internal void check_unroll_range_stmt(CheckerContext *ctx, Ast *node, u32 mod
error(x.expr, "Expected a constant integer for #unroll, got '%s'", s);
gb_string_free(s);
} else {
ExactValue value = exact_value_to_integer(x.value);
i64 v = exact_value_to_i64(value);
if (v < 1) {
error(x.expr, "Expected a constant integer >= 1 for #unroll, got %lld", cast(long long)v);
} else {
unroll_count = v;
if (v > 1024) {
error(x.expr, "Too large of a value for #unroll, got %lld, expected <= 1024", cast(long long)v);
convert_to_typed(ctx, &x, t_int);
if (x.mode != Addressing_Invalid) {
ExactValue value = exact_value_to_integer(x.value);
i64 v = exact_value_to_i64(value);
if (v < 1) {
error(x.expr, "Expected a constant integer >= 1 for #unroll, got %lld", cast(long long)v);
} else {
unroll_count = v;
if (v > 1024) {
error(x.expr, "Too large of a value for #unroll, got %lld, expected <= 1024", cast(long long)v);
}
}
}

7
src/check_type.cpp
View File

@@ -1120,6 +1120,13 @@ gb_internal void check_bit_field_type(CheckerContext *ctx, Type *bit_field_type,
gb_string_free(s);
}
if (o.mode == Addressing_Constant) {
convert_to_typed(ctx, &o, t_int);
if (o.mode == Addressing_Invalid) {
o.value = exact_value_i64(1);
}
}
ExactValue bit_size = o.value;
if (bit_size.kind != ExactValue_Integer) {