| ... | ... | @@ -2643,8 +2643,10 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool |
| 2643 | 2643 | try uleb128(diw, nav_val.toType().abiAlignment(zcu).toByteUnits().?); |
| 2644 | 2644 | for (0..loaded_struct.field_types.len) |field_index| { |
| 2645 | 2645 | const is_comptime = loaded_struct.fieldIsComptime(ip, field_index); |
| 2646 | | const field_init = loaded_struct.fieldInit(ip, field_index); |
| 2647 | | assert(!(is_comptime and field_init == .none)); |
| 2646 | const field_init = if (loaded_struct.haveFieldInits(ip)) |
| 2647 | loaded_struct.fieldInit(ip, field_index) |
| 2648 | else |
| 2649 | .none; |
| 2648 | 2650 | try wip_nav.abbrevCode(if (is_comptime) |
| 2649 | 2651 | .struct_field_comptime |
| 2650 | 2652 | else if (field_init != .none) |
| ... | ... | @@ -2656,14 +2658,20 @@ pub fn updateComptimeNav(dwarf: *Dwarf, pt: Zcu.PerThread, nav_index: InternPool |
| 2656 | 2658 | defer dwarf.gpa.free(field_name); |
| 2657 | 2659 | try wip_nav.strp(field_name); |
| 2658 | 2660 | } |
| 2659 | | const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]); |
| 2660 | | try wip_nav.refType(field_type); |
| 2661 | | if (!is_comptime) { |
| 2662 | | try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]); |
| 2663 | | try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse |
| 2664 | | field_type.abiAlignment(zcu).toByteUnits().?); |
| 2661 | if (is_comptime and field_init == .none) { |
| 2662 | // workaround frontend bug |
| 2663 | try wip_nav.refType(Type.void); |
| 2664 | try wip_nav.blockValue(nav_src_loc, Value.void); |
| 2665 | } else { |
| 2666 | const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]); |
| 2667 | try wip_nav.refType(field_type); |
| 2668 | if (!is_comptime) { |
| 2669 | try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]); |
| 2670 | try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse |
| 2671 | field_type.abiAlignment(zcu).toByteUnits().?); |
| 2672 | } |
| 2673 | if (field_init != .none) try wip_nav.blockValue(nav_src_loc, Value.fromInterned(field_init)); |
| 2665 | 2674 | } |
| 2666 | | if (field_init != .none) try wip_nav.blockValue(nav_src_loc, Value.fromInterned(field_init)); |
| 2667 | 2675 | } |
| 2668 | 2676 | try uleb128(diw, @intFromEnum(AbbrevCode.null)); |
| 2669 | 2677 | } |
| ... | ... | @@ -3503,8 +3511,10 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP |
| 3503 | 3511 | try uleb128(diw, ty.abiAlignment(zcu).toByteUnits().?); |
| 3504 | 3512 | for (0..loaded_struct.field_types.len) |field_index| { |
| 3505 | 3513 | const is_comptime = loaded_struct.fieldIsComptime(ip, field_index); |
| 3506 | | const field_init = loaded_struct.fieldInit(ip, field_index); |
| 3507 | | assert(!(is_comptime and field_init == .none)); |
| 3514 | const field_init = if (loaded_struct.haveFieldInits(ip)) |
| 3515 | loaded_struct.fieldInit(ip, field_index) |
| 3516 | else |
| 3517 | .none; |
| 3508 | 3518 | try wip_nav.abbrevCode(if (is_comptime) |
| 3509 | 3519 | .struct_field_comptime |
| 3510 | 3520 | else if (field_init != .none) |
| ... | ... | @@ -3516,14 +3526,20 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP |
| 3516 | 3526 | defer dwarf.gpa.free(field_name); |
| 3517 | 3527 | try wip_nav.strp(field_name); |
| 3518 | 3528 | } |
| 3519 | | const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]); |
| 3520 | | try wip_nav.refType(field_type); |
| 3521 | | if (!is_comptime) { |
| 3522 | | try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]); |
| 3523 | | try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse |
| 3524 | | field_type.abiAlignment(zcu).toByteUnits().?); |
| 3529 | if (is_comptime and field_init == .none) { |
| 3530 | // workaround frontend bug |
| 3531 | try wip_nav.refType(Type.void); |
| 3532 | try wip_nav.blockValue(ty_src_loc, Value.void); |
| 3533 | } else { |
| 3534 | const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]); |
| 3535 | try wip_nav.refType(field_type); |
| 3536 | if (!is_comptime) { |
| 3537 | try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]); |
| 3538 | try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse |
| 3539 | field_type.abiAlignment(zcu).toByteUnits().?); |
| 3540 | } |
| 3541 | if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init)); |
| 3525 | 3542 | } |
| 3526 | | if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init)); |
| 3527 | 3543 | } |
| 3528 | 3544 | try uleb128(diw, @intFromEnum(AbbrevCode.null)); |
| 3529 | 3545 | } |
| ... | ... | @@ -3579,8 +3595,10 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP |
| 3579 | 3595 | try uleb128(diw, ty.abiAlignment(zcu).toByteUnits().?); |
| 3580 | 3596 | for (0..loaded_struct.field_types.len) |field_index| { |
| 3581 | 3597 | const is_comptime = loaded_struct.fieldIsComptime(ip, field_index); |
| 3582 | | const field_init = loaded_struct.fieldInit(ip, field_index); |
| 3583 | | assert(!(is_comptime and field_init == .none)); |
| 3598 | const field_init = if (loaded_struct.haveFieldInits(ip)) |
| 3599 | loaded_struct.fieldInit(ip, field_index) |
| 3600 | else |
| 3601 | .none; |
| 3584 | 3602 | try wip_nav.abbrevCode(if (is_comptime) |
| 3585 | 3603 | .struct_field_comptime |
| 3586 | 3604 | else if (field_init != .none) |
| ... | ... | @@ -3592,14 +3610,20 @@ pub fn updateContainerType(dwarf: *Dwarf, pt: Zcu.PerThread, type_index: InternP |
| 3592 | 3610 | defer dwarf.gpa.free(field_name); |
| 3593 | 3611 | try wip_nav.strp(field_name); |
| 3594 | 3612 | } |
| 3595 | | const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]); |
| 3596 | | try wip_nav.refType(field_type); |
| 3597 | | if (!is_comptime) { |
| 3598 | | try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]); |
| 3599 | | try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse |
| 3600 | | field_type.abiAlignment(zcu).toByteUnits().?); |
| 3613 | if (is_comptime and field_init == .none) { |
| 3614 | // workaround frontend bug |
| 3615 | try wip_nav.refType(Type.void); |
| 3616 | try wip_nav.blockValue(ty_src_loc, Value.void); |
| 3617 | } else { |
| 3618 | const field_type = Type.fromInterned(loaded_struct.field_types.get(ip)[field_index]); |
| 3619 | try wip_nav.refType(field_type); |
| 3620 | if (!is_comptime) { |
| 3621 | try uleb128(diw, loaded_struct.offsets.get(ip)[field_index]); |
| 3622 | try uleb128(diw, loaded_struct.fieldAlign(ip, field_index).toByteUnits() orelse |
| 3623 | field_type.abiAlignment(zcu).toByteUnits().?); |
| 3624 | } |
| 3625 | if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init)); |
| 3601 | 3626 | } |
| 3602 | | if (field_init != .none) try wip_nav.blockValue(ty_src_loc, Value.fromInterned(field_init)); |
| 3603 | 3627 | } |
| 3604 | 3628 | try uleb128(diw, @intFromEnum(AbbrevCode.null)); |
| 3605 | 3629 | } |
Jacob Young <jacobly@ziglang.org> 2024-09-09 08:14:27-04:00