Skip to content

Commit 6752ce8

Browse files
committed
builtin,dlmalloc: fixes for v vlib/v/gen/c/coutput_test.v for gcc14.1, which is stricter
1 parent 5fbf676 commit 6752ce8

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

vlib/builtin/linux_bare/linux_syscalls.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ fn sys_dup2(oldfd int, newfd int) (i64, Errno) {
307307

308308
// 59 sys_execve
309309
fn sys_execve(filename &u8, argv []&u8, envp []&u8) int {
310-
return int(sys_call3(59, u64(filename), argv.data, envp.data))
310+
return int(sys_call3(59, u64(filename), u64(argv.data), u64(envp.data)))
311311
}
312312

313313
// 60 sys_exit

vlib/dlmalloc/dlmalloc.v

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,8 @@ fn (mut dl Dlmalloc) init_bins() {
10481048

10491049
@[unsafe]
10501050
fn (mut dl Dlmalloc) init_top(ptr &Chunk, size_ usize) {
1051-
offset := align_offset_usize(ptr.to_mem())
1051+
pmem := ptr.to_mem()
1052+
offset := align_offset_usize(usize(pmem))
10521053
mut p := ptr.plus_offset(offset)
10531054

10541055
size := size_ - offset
@@ -1301,7 +1302,8 @@ fn (mut dl Dlmalloc) add_segment(tbase voidptr, tsize usize, flags u32) {
13011302
ssize := pad_request(sizeof(Segment))
13021303
mut offset := ssize + sizeof(usize) * 4 + malloc_alignment() - 1
13031304
rawsp := voidptr(usize(old_end) - offset)
1304-
offset = align_offset_usize((&Chunk(rawsp)).to_mem())
1305+
pmem := (&Chunk(rawsp)).to_mem()
1306+
offset = align_offset_usize(usize(pmem))
13051307
asp := voidptr(usize(rawsp) + offset)
13061308
csp := if asp < voidptr(usize(old_top) + min_chunk_size()) { old_top } else { asp }
13071309
mut sp := &Chunk(csp)

0 commit comments

Comments
 (0)