Merge pull request #4339 from laytan/fix-swizzle-in-for

fix swizzle in for in statement
This commit is contained in:
Jeroen van Rijn
2025-06-02 21:20:11 +02:00
committed by GitHub
5 changed files with 44 additions and 6 deletions
+6 -3
View File
@@ -546,8 +546,11 @@ gb_internal lbValue lb_addr_get_ptr(lbProcedure *p, lbAddr const &addr) {
break;
case lbAddr_Swizzle:
GB_PANIC("lbAddr_Swizzle should be handled elsewhere");
break;
case lbAddr_SwizzleLarge:
// TOOD(bill): is this good enough logic?
GB_PANIC("lbAddr_SwizzleLarge should be handled elsewhere");
break;
}
@@ -922,7 +925,7 @@ gb_internal void lb_addr_store(lbProcedure *p, lbAddr addr, lbValue value) {
GB_ASSERT(value.value != nullptr);
value = lb_emit_conv(p, value, lb_addr_type(addr));
lbValue dst = lb_addr_get_ptr(p, addr);
lbValue dst = addr.addr;
lbValue src = lb_address_from_load_or_generate_local(p, value);
{
lbValue src_ptrs[4] = {};
@@ -948,7 +951,7 @@ gb_internal void lb_addr_store(lbProcedure *p, lbAddr addr, lbValue value) {
GB_ASSERT(value.value != nullptr);
value = lb_emit_conv(p, value, lb_addr_type(addr));
lbValue dst = lb_addr_get_ptr(p, addr);
lbValue dst = addr.addr;
lbValue src = lb_address_from_load_or_generate_local(p, value);
for_array(i, addr.swizzle_large.indices) {
lbValue src_ptr = lb_emit_array_epi(p, src, i);
+15 -3
View File
@@ -1072,10 +1072,22 @@ gb_internal void lb_build_range_stmt(lbProcedure *p, AstRangeStmt *rs, Scope *sc
break;
}
case Type_Array: {
lbValue array = lb_build_addr_ptr(p, expr);
if (is_type_pointer(type_deref(array.type))) {
array = lb_emit_load(p, array);
lbValue array;
lbAddr addr = lb_build_addr(p, expr);
switch (addr.kind) {
case lbAddr_Swizzle:
case lbAddr_SwizzleLarge:
// NOTE(laytan): apply the swizzle.
array = lb_address_from_load(p, lb_addr_load(p, addr));
break;
default:
array = lb_addr_get_ptr(p, addr);
if (is_type_pointer(type_deref(array.type))) {
array = lb_emit_load(p, array);
}
break;
}
lbAddr count_ptr = lb_add_local_generated(p, t_int, false);
lb_addr_store(p, count_ptr, lb_const_int(p->module, t_int, et->Array.count));
lb_build_range_indexed(p, array, val0_type, count_ptr.addr, &val, &key, &loop, &done, rs->reverse);