language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 06:14:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

hopefully get the logic right this time

Browse source
This commit is contained in:
Folkert 2021-09-01 15:56:50 +02:00
parent 4731cbd391
commit 3ef4a40f45
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/builtins/bitcode/src/dict.zig
View file

@ -69,7 +69,7 @@ const Alignment = extern struct {
const VALUE_BEFORE_KEY_FLAG: u8 = 0b1000_0000;
fn toU32(self: Alignment) u32 {
if (self.bits & Alignment.VALUE_BEFORE_KEY_FLAG == 1) {
if (self.bits >= VALUE_BEFORE_KEY_FLAG) {
return self.bits ^ Alignment.VALUE_BEFORE_KEY_FLAG;
} else {
return self.bits;

21
compiler/builtins/bitcode/src/utils.zig
View file

@ -155,13 +155,16 @@ pub fn decref(
pub fn allocateWithRefcount(
data_bytes: usize,
alignment: u32,
element_alignment: u32,
) [*]u8 {
const result_in_place = false;
const alignment = std.math.max(@sizeOf(usize), element_alignment);
const first_slot_offset = std.math.max(@sizeOf(usize), element_alignment);
switch (alignment) {
16 => {
const length = std.math.max(alignment, @sizeOf(usize)) + data_bytes;
const length = 16 + data_bytes;
var new_bytes: [*]align(16) u8 = @alignCast(16, alloc(length, alignment));
@ -175,12 +178,12 @@ pub fn allocateWithRefcount(
}
var as_u8_array = @ptrCast([*]u8, new_bytes);
const first_slot = as_u8_array + std.math.max(alignment, @sizeOf(usize)) - @sizeOf(usize);
const first_slot = as_u8_array + first_slot_offset;
return first_slot;
},
8 => {
const length = std.math.max(alignment, @sizeOf(usize)) + data_bytes;
const length = 8 + data_bytes;
var raw = alloc(length, alignment);
var new_bytes: [*]align(8) u8 = @alignCast(8, raw);
@ -193,15 +196,15 @@ pub fn allocateWithRefcount(
}
var as_u8_array = @ptrCast([*]u8, new_bytes);
const first_slot = as_u8_array + std.math.max(alignment, @sizeOf(usize)) - @sizeOf(usize);
const first_slot = as_u8_array + first_slot_offset;
return first_slot;
},
4 => {
const length = std.math.max(alignment, @sizeOf(usize)) + data_bytes;
const length = 4 + data_bytes;
var raw = alloc(length, alignment);
var new_bytes: [*]align(4) u8 = @alignCast(4, raw);
var new_bytes: [*]align(@alignOf(isize)) u8 = @alignCast(@alignOf(isize), raw);
var as_isize_array = @ptrCast([*]isize, new_bytes);
if (result_in_place) {
@ -211,11 +214,13 @@ pub fn allocateWithRefcount(
}
var as_u8_array = @ptrCast([*]u8, new_bytes);
const first_slot = as_u8_array + std.math.max(alignment, @sizeOf(usize)) - @sizeOf(usize);
const first_slot = as_u8_array + first_slot_offset;
return first_slot;
},
else => {
const stdout = std.io.getStdOut().writer();
stdout.print("alignment: {d}", .{alignment}) catch unreachable;
@panic("allocateWithRefcount with invalid alignment");
},
}