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

Fix bounds checking

Browse Source
This commit is contained in:
gingerBill
2024-03-20 10:24:39 +00:00
parent 3bff922b6f
commit 553a244fec
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llvm_backend_expr.cpp
+4 -1
View File
@@ -3991,17 +3991,20 @@ gb_internal lbAddr lb_build_addr_index_expr(lbProcedure *p, Ast *expr) {
lbValue index = lb_build_expr(p, ie->index); lbValue index = lb_build_expr(p, ie->index);
index = lb_emit_conv(p, index, t_int); index = lb_emit_conv(p, index, t_int);
isize bounds_len = 0;
lbValue elem = {}; lbValue elem = {};
if (t->Matrix.is_row_major) { if (t->Matrix.is_row_major) {
bounds_len = t->Matrix.row_count;
elem = lb_emit_matrix_ep(p, matrix, index, lb_const_int(p->module, t_int, 0)); elem = lb_emit_matrix_ep(p, matrix, index, lb_const_int(p->module, t_int, 0));
} else { } else {
bounds_len = t->Matrix.column_count;
elem = lb_emit_matrix_ep(p, matrix, lb_const_int(p->module, t_int, 0), index); elem = lb_emit_matrix_ep(p, matrix, lb_const_int(p->module, t_int, 0), index);
} }
elem = lb_emit_conv(p, elem, alloc_type_pointer(type_of_expr(expr))); elem = lb_emit_conv(p, elem, alloc_type_pointer(type_of_expr(expr)));
auto index_tv = type_and_value_of_expr(ie->index); auto index_tv = type_and_value_of_expr(ie->index);
if (index_tv.mode != Addressing_Constant) { if (index_tv.mode != Addressing_Constant) {
lbValue len = lb_const_int(p->module, t_int, t->Matrix.column_count); lbValue len = lb_const_int(p->module, t_int, bounds_len);
lb_emit_bounds_check(p, ast_token(ie->index), index, len); lb_emit_bounds_check(p, ast_token(ie->index), index, len);
} }
return lb_addr(elem); return lb_addr(elem);