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

Merge pull request #6178 from odin-lang/bill/force-type-assert

Browse Source 
Add `#+feature force-type-assert` which overrides `-no-type-assert` on a per-file basis
This commit is contained in:
gingerBill
2026-01-26 16:14:42 +00:00
committed by GitHub
parent a69c3edcdf 0774b7465f
commit 467954bc7b
2 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/build_settings.cpp
View File

@@ -360,12 +360,15 @@ enum OptInFeatureFlags : u64 {
OptInFeatureFlag_IntegerDivisionByZero_Self = 1u<<4,
OptInFeatureFlag_IntegerDivisionByZero_AllBits = 1u<<5,
OptInFeatureFlag_IntegerDivisionByZero_ALL = OptInFeatureFlag_IntegerDivisionByZero_Trap|
OptInFeatureFlag_IntegerDivisionByZero_Zero|
OptInFeatureFlag_IntegerDivisionByZero_Self|
OptInFeatureFlag_IntegerDivisionByZero_AllBits,
OptInFeatureFlag_ForceTypeAssert = 1u<<6,
};
u64 get_feature_flag_from_name(String const &name) {
@@ -384,6 +387,9 @@ u64 get_feature_flag_from_name(String const &name) {
if (name == "integer-division-by-zero:all-bits") {
return OptInFeatureFlag_IntegerDivisionByZero_AllBits;
}
if (name == "force-type-assert") {
return OptInFeatureFlag_ForceTypeAssert;
}
if (name == "global-context") {

61
src/llvm_backend_expr.cpp
View File

@@ -282,11 +282,16 @@ gb_internal lbValue lb_emit_unary_arith(lbProcedure *p, TokenKind op, lbValue x,
return res;
}
gb_internal IntegerDivisionByZeroKind lb_check_for_integer_division_by_zero_behaviour(lbProcedure *p) {
gb_internal u64 lb_get_file_feature_flags(lbProcedure *p, Ast *expr = nullptr) {
AstFile *file = nullptr;
if (p->body && p->body->file()) {
if (expr != nullptr) {
file = expr->file();
}
if (file != nullptr) {
// it is now set
} else if (p->body && p->body->file()) {
file = p->body->file();
} else if (p->type_expr && p->type_expr->file()) {
file = p->type_expr->file();
@@ -295,20 +300,29 @@ gb_internal IntegerDivisionByZeroKind lb_check_for_integer_division_by_zero_beha
}
if (file != nullptr && file->feature_flags_set) {
u64 flags = file->feature_flags;
if (flags & OptInFeatureFlag_IntegerDivisionByZero_Trap) {
return IntegerDivisionByZero_Trap;
}
if (flags & OptInFeatureFlag_IntegerDivisionByZero_Zero) {
return IntegerDivisionByZero_Zero;
}
if (flags & OptInFeatureFlag_IntegerDivisionByZero_Self) {
return IntegerDivisionByZero_Self;
}
if (flags & OptInFeatureFlag_IntegerDivisionByZero_AllBits) {
return IntegerDivisionByZero_AllBits;
}
return file->feature_flags;
}
return 0;
}
gb_internal IntegerDivisionByZeroKind lb_check_for_integer_division_by_zero_behaviour(lbProcedure *p) {
u64 flags = lb_get_file_feature_flags(p);
if (flags & OptInFeatureFlag_IntegerDivisionByZero_Trap) {
return IntegerDivisionByZero_Trap;
}
if (flags & OptInFeatureFlag_IntegerDivisionByZero_Zero) {
return IntegerDivisionByZero_Zero;
}
if (flags & OptInFeatureFlag_IntegerDivisionByZero_Self) {
return IntegerDivisionByZero_Self;
}
if (flags & OptInFeatureFlag_IntegerDivisionByZero_AllBits) {
return IntegerDivisionByZero_AllBits;
}
return build_context.integer_division_by_zero_behaviour;
}
@@ -3802,6 +3816,17 @@ gb_internal lbValue lb_build_unary_and(lbProcedure *p, Ast *expr) {
Type *type = type_of_expr(ue_expr);
GB_ASSERT(!is_type_tuple(type));
bool do_type_check = true;
if (build_context.no_type_assert) {
u64 feature_flags = lb_get_file_feature_flags(p, ue_expr);
if ((feature_flags & OptInFeatureFlag_ForceTypeAssert) == 0) {
do_type_check = false;
}
} else if ((p->state_flags & StateFlag_no_type_assert) != 0) {
do_type_check = false;
}
lbValue e = lb_build_expr(p, ta->expr);
Type *t = type_deref(e.type);
if (is_type_union(t)) {
@@ -3813,7 +3838,7 @@ gb_internal lbValue lb_build_unary_and(lbProcedure *p, Ast *expr) {
Type *dst_type = type;
if (!build_context.no_type_assert && (p->state_flags & StateFlag_no_type_assert) == 0) {
if (do_type_check) {
lbValue src_tag = {};
lbValue dst_tag = {};
if (is_type_union_maybe_pointer(src_type)) {
@@ -3851,7 +3876,7 @@ gb_internal lbValue lb_build_unary_and(lbProcedure *p, Ast *expr) {
v = lb_emit_load(p, v);
}
lbValue data_ptr = lb_emit_struct_ev(p, v, 0);
if (!build_context.no_type_assert && (p->state_flags & StateFlag_no_type_assert) == 0) {
if (do_type_check) {
GB_ASSERT(!build_context.no_rtti);
lbValue any_id = lb_emit_struct_ev(p, v, 1);