mirror/Odin
1
0 Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-10-12 11:09:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fallback to the pre-split bounds check handlers when the runtime lacks the new ones

Browse Source
This commit is contained in:
gingerBill committed 2026-10-11 10:36:15 +01:00
1 parent 0f991097d8
commit 9672dca06d
2 files changed
+22 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/checker.cpp
+7
View File
@@ -3481,6 +3481,13 @@ gb_internal void generate_minimum_dependency_set(Checker *c, Entity *start) {
str_lit("slice_expr_error_lo_hi_with_context"),
str_lit("multi_pointer_slice_expr_error_contextless"),
str_lit("multi_pointer_slice_expr_error_with_context"),
// Runtimes from before the `contextless`/`with_context` split
str_lit("bounds_check_error"),
str_lit("matrix_bounds_check_error"),
str_lit("slice_expr_error_hi"),
str_lit("slice_expr_error_lo_hi"),
str_lit("multi_pointer_slice_expr_error"),
);
FORCE_ADD_RUNTIME_ENTITIES(c->info.objc_class_implementations.count.load(std::memory_order_relaxed) > 0,
src/llvm_backend_general.cpp
+15 -5
View File
@@ -1242,6 +1242,16 @@ gb_internal bool lb_bounds_check_short_circuit(lbProcedure *p, lbValue index, lb
return false;
}
gb_internal void lb_emit_bounds_check_handler_call(lbProcedure *p, char const *handler, char const *old_handler, Array<lbValue> const &args) {
Scope *scope = p->module->info->runtime_package->scope;
Entity *e = scope_lookup_current(scope, string_interner_insert(make_string_c(handler)));
if (e == nullptr) {
e = scope_lookup_current(scope, string_interner_insert(make_string_c(old_handler)));
}
GB_ASSERT_MSG(e != nullptr, "Runtime procedure not found: %s", handler);
lb_emit_call(p, lb_find_procedure_value_from_entity(p->module, e), args);
}
gb_internal void lb_emit_bounds_check(lbProcedure *p, Token token, lbValue index, lbValue len) {
if (lb_bounds_check_short_circuit(p, index, len)) {
return;
@@ -1261,7 +1271,7 @@ gb_internal void lb_emit_bounds_check(lbProcedure *p, Token token, lbValue index
if (p->context_stack.count > 0) {
handler = "bounds_check_error_with_context";
}
lb_emit_runtime_call(p, handler, args);
lb_emit_bounds_check_handler_call(p, handler, "bounds_check_error", args);
}
gb_internal void lb_emit_matrix_bounds_check(lbProcedure *p, Token token, lbValue row_index, lbValue column_index, lbValue row_count, lbValue column_count) {
@@ -1287,7 +1297,7 @@ gb_internal void lb_emit_matrix_bounds_check(lbProcedure *p, Token token, lbValu
if (p->context_stack.count > 0) {
handler = "matrix_bounds_check_error_with_context";
}
lb_emit_runtime_call(p, handler, args);
lb_emit_bounds_check_handler_call(p, handler, "matrix_bounds_check_error", args);
}
@@ -1317,7 +1327,7 @@ gb_internal void lb_emit_multi_pointer_slice_bounds_check(lbProcedure *p, Token
if (p->context_stack.count > 0) {
handler = "multi_pointer_slice_expr_error_with_context";
}
lb_emit_runtime_call(p, handler, args);
lb_emit_bounds_check_handler_call(p, handler, "multi_pointer_slice_expr_error", args);
}
gb_internal void lb_emit_slice_bounds_check(lbProcedure *p, Token token, lbValue low, lbValue high, lbValue len, bool lower_value_used) {
@@ -1346,7 +1356,7 @@ gb_internal void lb_emit_slice_bounds_check(lbProcedure *p, Token token, lbValue
if (p->context_stack.count > 0) {
handler = "slice_expr_error_hi_with_context";
}
lb_emit_runtime_call(p, handler, args);
lb_emit_bounds_check_handler_call(p, handler, "slice_expr_error_hi", args);
} else {
// No need to convert unless used
low = lb_emit_conv(p, low, t_int);
@@ -1361,7 +1371,7 @@ gb_internal void lb_emit_slice_bounds_check(lbProcedure *p, Token token, lbValue
if (p->context_stack.count > 0) {
handler = "slice_expr_error_lo_hi_with_context";
}
lb_emit_runtime_call(p, handler, args);
lb_emit_bounds_check_handler_call(p, handler, "slice_expr_error_lo_hi", args);
}
}