mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-11 19:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgrade zig to v0.11.0-dev.3737+9eb008717 (#3374)

Browse Source 
* progress

* finish `@memset/@memcpy` update

* Update build.zig

* change `@enumToInt` to `@intFromEnum` and friends

* update zig versions

* it was 1

* add link to issue

* add `compileError` reminder

* fix merge

* format

* upgrade to llvm 16

* Revert "upgrade to llvm 16"

This reverts commit cc930ceb1c.

---------

Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
This commit is contained in:
Dylan Conway
2023-06-21 23:38:18 -07:00
committed by GitHub
parent bfb322d618
commit 5fa13625a1
152 changed files with 1772 additions and 1584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/multi_array_list.zig
View File

@@ -33,7 +33,7 @@ pub fn MultiArrayList(comptime S: type) type {
/// and then get the field arrays from the slice.
pub const Slice = struct {
/// This array is indexed by the field index which can be obtained
/// by using @enumToInt() on the Field enum
/// by using @intFromEnum() on the Field enum
ptrs: [fields.len][*]u8,
len: usize,
capacity: usize,
@@ -43,7 +43,7 @@ pub fn MultiArrayList(comptime S: type) type {
if (self.capacity == 0) {
return &[_]F{};
}
const byte_ptr = self.ptrs[@enumToInt(field)];
const byte_ptr = self.ptrs[@intFromEnum(field)];
const casted_ptr: [*]F = if (@sizeOf(F) == 0)
undefined
else
@@ -97,7 +97,7 @@ pub fn MultiArrayList(comptime S: type) type {
return lhs.alignment > rhs.alignment;
}
};
std.sort.sort(Data, &data, {}, Sort.lessThan);
std.sort.block(Data, &data, {}, Sort.lessThan);
var sizes_bytes: [fields.len]usize = undefined;
var field_indexes: [fields.len]usize = undefined;
for (data, 0..) |elem, i| {
@@ -151,7 +151,7 @@ pub fn MultiArrayList(comptime S: type) type {
pub fn set(self: *Self, index: usize, elem: S) void {
const slices = self.slice();
inline for (fields, 0..) |field_info, i| {
slices.items(@intToEnum(Field, i))[index] = @field(elem, field_info.name);
slices.items(@enumFromInt(Field, i))[index] = @field(elem, field_info.name);
}
}
@@ -160,7 +160,7 @@ pub fn MultiArrayList(comptime S: type) type {
const slices = self.slice();
var result: S = undefined;
inline for (fields, 0..) |field_info, i| {
@field(result, field_info.name) = slices.items(@intToEnum(Field, i))[index];
@field(result, field_info.name) = slices.items(@enumFromInt(Field, i))[index];
}
return result;
}
@@ -233,7 +233,7 @@ pub fn MultiArrayList(comptime S: type) type {
self.len += 1;
const slices = self.slice();
inline for (fields, 0..) |field_info, field_index| {
const field_slice = slices.items(@intToEnum(Field, field_index));
const field_slice = slices.items(@enumFromInt(Field, field_index));
var i: usize = self.len - 1;
while (i > index) : (i -= 1) {
field_slice[i] = field_slice[i - 1];
@@ -248,7 +248,7 @@ pub fn MultiArrayList(comptime S: type) type {
pub fn swapRemove(self: *Self, index: usize) void {
const slices = self.slice();
inline for (fields, 0..) |_, i| {
const field_slice = slices.items(@intToEnum(Field, i));
const field_slice = slices.items(@enumFromInt(Field, i));
field_slice[index] = field_slice[self.len - 1];
field_slice[self.len - 1] = undefined;
}
@@ -260,7 +260,7 @@ pub fn MultiArrayList(comptime S: type) type {
pub fn orderedRemove(self: *Self, index: usize) void {
const slices = self.slice();
inline for (fields, 0..) |_, field_index| {
const field_slice = slices.items(@intToEnum(Field, field_index));
const field_slice = slices.items(@enumFromInt(Field, field_index));
var i = index;
while (i < self.len - 1) : (i += 1) {
field_slice[i] = field_slice[i + 1];
@@ -297,13 +297,12 @@ pub fn MultiArrayList(comptime S: type) type {
const self_slice = self.slice();
inline for (fields, 0..) |field_info, i| {
if (@sizeOf(field_info.type) != 0) {
const field = @intToEnum(Field, i);
const field = @enumFromInt(Field, i);
const dest_slice = self_slice.items(field)[new_len..];
const byte_count = dest_slice.len * @sizeOf(field_info.type);
// We use memset here for more efficient codegen in safety-checked,
// valgrind-enabled builds. Otherwise the valgrind client request
// will be repeated for every element.
@memset(@ptrCast([*]u8, dest_slice.ptr), undefined, byte_count);
@memset(dest_slice, undefined);
}
}
self.len = new_len;
@@ -319,7 +318,7 @@ pub fn MultiArrayList(comptime S: type) type {
const other_slice = other.slice();
inline for (fields, 0..) |field_info, i| {
if (@sizeOf(field_info.type) != 0) {
const field = @intToEnum(Field, i);
const field = @enumFromInt(Field, i);
mem.copy(field_info.type, other_slice.items(field), self_slice.items(field));
}
}
@@ -380,7 +379,7 @@ pub fn MultiArrayList(comptime S: type) type {
const other_slice = other.slice();
inline for (fields, 0..) |field_info, i| {
if (@sizeOf(field_info.type) != 0) {
const field = @intToEnum(Field, i);
const field = @enumFromInt(Field, i);
mem.copy(field_info.type, other_slice.items(field), self_slice.items(field));
}
}
@@ -399,7 +398,7 @@ pub fn MultiArrayList(comptime S: type) type {
const result_slice = result.slice();
inline for (fields, 0..) |field_info, i| {
if (@sizeOf(field_info.type) != 0) {
const field = @intToEnum(Field, i);
const field = @enumFromInt(Field, i);
mem.copy(field_info.type, result_slice.items(field), self_slice.items(field));
}
}
@@ -420,7 +419,7 @@ pub fn MultiArrayList(comptime S: type) type {
pub fn swap(sc: @This(), a_index: usize, b_index: usize) void {
inline for (fields, 0..) |field_info, i| {
if (@sizeOf(field_info.type) != 0) {
const field = @intToEnum(Field, i);
const field = @enumFromInt(Field, i);
const ptr = sc.slice.items(field);
mem.swap(field_info.type, &ptr[a_index], &ptr[b_index]);
}
@@ -432,7 +431,7 @@ pub fn MultiArrayList(comptime S: type) type {
}
};
std.sort.sortContext(self.len, SortContext{
std.sort.blockContext(0, self.len, SortContext{
.sub_ctx = ctx,
.slice = self.slice(),
});
@@ -457,7 +456,7 @@ pub fn MultiArrayList(comptime S: type) type {
const this_slice = this.slice();
inline for (fields, 0..) |field_info, i| {
if (@sizeOf(field_info.type) != 0) {
const field = @intToEnum(Field, i);
const field = @enumFromInt(Field, i);
mem.copy(field_info.type, this_slice.items(field)[offset..], other_slice.items(field));
}
}
@@ -475,7 +474,7 @@ pub fn MultiArrayList(comptime S: type) type {
pub fn zero(this: *Self) void {
var allocated = this.allocatedBytes();
if (allocated.len > 0) {
@memset(allocated.ptr, 0, allocated.len);
@memset(allocated, 0);
}
}