diff options
| author | Ali Chraghi <alichraghi@pm.me> | 2022-10-03 20:04:30 +0330 |
|---|---|---|
| committer | Veikka Tuominen <git@vexu.eu> | 2022-10-18 14:15:16 +0300 |
| commit | ca27055cdaa82fc26a8d9f8bf6a71de995adc539 (patch) | |
| tree | 8a8bf8a5f6848a2c7a55deeecf5a1257fa4ed794 /src/type.zig | |
| parent | edc842ff18e19d8c07cde1199f72903356fbf77f (diff) | |
| download | zig-ca27055cdaa82fc26a8d9f8bf6a71de995adc539.tar.gz zig-ca27055cdaa82fc26a8d9f8bf6a71de995adc539.zip | |
all: rename `@maximum` to `@max` and `@minimum` to `@min`
Diffstat (limited to 'src/type.zig')
| -rw-r--r-- | src/type.zig | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/type.zig b/src/type.zig index 5685d097b9..62586e86ee 100644 --- a/src/type.zig +++ b/src/type.zig @@ -2998,7 +2998,7 @@ pub const Type = extern union { return child_type.abiAlignmentAdvanced(target, strat); }, .lazy => |arena| switch (try child_type.abiAlignmentAdvanced(target, strat)) { - .scalar => |x| return AbiAlignmentAdvanced{ .scalar = @maximum(x, 1) }, + .scalar => |x| return AbiAlignmentAdvanced{ .scalar = @max(x, 1) }, .val => return AbiAlignmentAdvanced{ .val = try Value.Tag.lazy_align.create(arena, ty) }, }, } @@ -3014,7 +3014,7 @@ pub const Type = extern union { if (!(try data.payload.hasRuntimeBitsAdvanced(false, sema_kit))) { return AbiAlignmentAdvanced{ .scalar = code_align }; } - return AbiAlignmentAdvanced{ .scalar = @maximum( + return AbiAlignmentAdvanced{ .scalar = @max( code_align, (try data.payload.abiAlignmentAdvanced(target, strat)).scalar, ) }; @@ -3023,7 +3023,7 @@ pub const Type = extern union { switch (try data.payload.abiAlignmentAdvanced(target, strat)) { .scalar => |payload_align| { return AbiAlignmentAdvanced{ - .scalar = @maximum(code_align, payload_align), + .scalar = @max(code_align, payload_align), }; }, .val => {}, @@ -3077,14 +3077,14 @@ pub const Type = extern union { .lazy => |arena| return AbiAlignmentAdvanced{ .val = try Value.Tag.lazy_align.create(arena, ty) }, }, }; - big_align = @maximum(big_align, field_align); + big_align = @max(big_align, field_align); // This logic is duplicated in Module.Struct.Field.alignment. if (struct_obj.layout == .Extern or target.ofmt == .c) { if (field.ty.isAbiInt() and field.ty.intInfo(target).bits >= 128) { // The C ABI requires 128 bit integer fields of structs // to be 16-bytes aligned. - big_align = @maximum(big_align, 16); + big_align = @max(big_align, 16); } } } @@ -3099,7 +3099,7 @@ pub const Type = extern union { if (val.tag() != .unreachable_value) continue; // comptime field switch (try field_ty.abiAlignmentAdvanced(target, strat)) { - .scalar => |field_align| big_align = @maximum(big_align, field_align), + .scalar => |field_align| big_align = @max(big_align, field_align), .val => switch (strat) { .eager => unreachable, // field type alignment not resolved .sema_kit => unreachable, // passed to abiAlignmentAdvanced above @@ -3194,7 +3194,7 @@ pub const Type = extern union { .lazy => |arena| return AbiAlignmentAdvanced{ .val = try Value.Tag.lazy_align.create(arena, ty) }, }, }; - max_align = @maximum(max_align, field_align); + max_align = @max(max_align, field_align); } return AbiAlignmentAdvanced{ .scalar = max_align }; } @@ -3565,7 +3565,7 @@ pub const Type = extern union { } fn intAbiAlignment(bits: u16, target: Target) u32 { - return @minimum( + return @min( std.math.ceilPowerOfTwoPromote(u16, (bits + 7) / 8), target.maxIntAlignment(), ); @@ -3648,7 +3648,7 @@ pub const Type = extern union { var size: u64 = 0; for (union_obj.fields.values()) |field| { - size = @maximum(size, try bitSizeAdvanced(field.ty, target, sema_kit)); + size = @max(size, try bitSizeAdvanced(field.ty, target, sema_kit)); } return size; }, @@ -5760,7 +5760,7 @@ pub const Type = extern union { } const field_align = field.alignment(it.target, it.struct_obj.layout); - it.big_align = @maximum(it.big_align, field_align); + it.big_align = @max(it.big_align, field_align); const field_offset = std.mem.alignForwardGeneric(u64, it.offset, field_align); it.offset = field_offset + field.ty.abiSize(it.target); return FieldOffset{ .field = i, .offset = field_offset }; @@ -5789,7 +5789,7 @@ pub const Type = extern union { return field_offset.offset; } - return std.mem.alignForwardGeneric(u64, it.offset, @maximum(it.big_align, 1)); + return std.mem.alignForwardGeneric(u64, it.offset, @max(it.big_align, 1)); }, .tuple, .anon_struct => { @@ -5807,12 +5807,12 @@ pub const Type = extern union { } const field_align = field_ty.abiAlignment(target); - big_align = @maximum(big_align, field_align); + big_align = @max(big_align, field_align); offset = std.mem.alignForwardGeneric(u64, offset, field_align); if (i == index) return offset; offset += field_ty.abiSize(target); } - offset = std.mem.alignForwardGeneric(u64, offset, @maximum(big_align, 1)); + offset = std.mem.alignForwardGeneric(u64, offset, @max(big_align, 1)); return offset; }, |
