diff options
| author | David Rubin <daviru007@icloud.com> | 2024-08-25 22:43:57 -0700 |
|---|---|---|
| committer | David Rubin <daviru007@icloud.com> | 2024-08-25 22:43:57 -0700 |
| commit | f777b298327de95d2a54d814ca562c08fd7c7a87 (patch) | |
| tree | b6d4b3fe7925911cf861f22b0a668d78c3a6d223 /src/Value.zig | |
| parent | ce92ccccc961992c00a10e714ce9e799956c50f2 (diff) | |
| download | zig-f777b298327de95d2a54d814ca562c08fd7c7a87.tar.gz zig-f777b298327de95d2a54d814ca562c08fd7c7a87.zip | |
fix up merge conflicts with master
Diffstat (limited to 'src/Value.zig')
| -rw-r--r-- | src/Value.zig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Value.zig b/src/Value.zig index 7861d494a9..516561d581 100644 --- a/src/Value.zig +++ b/src/Value.zig @@ -4196,14 +4196,14 @@ pub fn pointerDerivationAdvanced(ptr_val: Value, arena: Allocator, pt: Zcu.PerTh const base_ptr_ty = base_ptr.typeOf(zcu); const agg_ty = base_ptr_ty.childType(zcu); const field_ty, const field_align = switch (agg_ty.zigTypeTag(zcu)) { - .Struct => .{ agg_ty.fieldType(field.index, zcu), try agg_ty.fieldAlignmentInner( - field.index, + .Struct => .{ agg_ty.fieldType(@intCast(field.index), zcu), try agg_ty.fieldAlignmentInner( + @intCast(field.index), if (have_sema) .sema else .normal, pt.zcu, if (have_sema) pt.tid else {}, ) }, - .Union => .{ agg_ty.unionFieldTypeByIndex(field.index, zcu), try agg_ty.fieldAlignmentInner( - field.index, + .Union => .{ agg_ty.unionFieldTypeByIndex(@intCast(field.index), zcu), try agg_ty.fieldAlignmentInner( + @intCast(field.index), if (have_sema) .sema else .normal, pt.zcu, if (have_sema) pt.tid else {}, |