aboutsummaryrefslogtreecommitdiff
path: root/src/Sema.zig
diff options
context:
space:
mode:
authorAlex Rønne Petersen <alex@alexrp.com>2024-10-25 11:10:28 +0200
committerGitHub <noreply@github.com>2024-10-25 11:10:28 +0200
commit03d0e296cb8a8afb2bd81c030b31e96e6e2940c7 (patch)
treef340a6c090dd562ec0d710573d66e1651ced5bd5 /src/Sema.zig
parent5769592cdda3c14a37b8c381219343052609cbbc (diff)
parent6c1e306484530bfeaf26450fb83a70ff1c323bcd (diff)
downloadzig-03d0e296cb8a8afb2bd81c030b31e96e6e2940c7.tar.gz
zig-03d0e296cb8a8afb2bd81c030b31e96e6e2940c7.zip
Merge pull request #21710 from alexrp/function-alignment
Some improvements to the compiler's handling of function alignment
Diffstat (limited to 'src/Sema.zig')
-rw-r--r--src/Sema.zig8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/Sema.zig b/src/Sema.zig
index 9912a610ff..24e64cbc46 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -26658,9 +26658,7 @@ fn zirFuncFancy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
if (val.isGenericPoison()) {
break :blk null;
}
- const alignment = try sema.validateAlignAllowZero(block, align_src, try val.toUnsignedIntSema(pt));
- const default = target_util.defaultFunctionAlignment(target);
- break :blk if (alignment == default) .none else alignment;
+ break :blk try sema.validateAlignAllowZero(block, align_src, try val.toUnsignedIntSema(pt));
} else if (extra.data.bits.has_align_ref) blk: {
const align_ref: Zir.Inst.Ref = @enumFromInt(sema.code.extra[extra_index]);
extra_index += 1;
@@ -26678,9 +26676,7 @@ fn zirFuncFancy(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
error.GenericPoison => break :blk null,
else => |e| return e,
};
- const alignment = try sema.validateAlignAllowZero(block, align_src, try align_val.toUnsignedIntSema(pt));
- const default = target_util.defaultFunctionAlignment(target);
- break :blk if (alignment == default) .none else alignment;
+ break :blk try sema.validateAlignAllowZero(block, align_src, try align_val.toUnsignedIntSema(pt));
} else .none;
const @"addrspace": ?std.builtin.AddressSpace = if (extra.data.bits.has_addrspace_body) blk: {