vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

builtin: inline manually isnil calls in array.push_many (very frequently called)

Delyan Angelov 2022-05-07 10:35:56 +03:00 committed by Jef Roosens
parent 5ff83f5990
commit ed9cb69d07
Signed by: Jef Roosens
GPG Key ID: B75D4F293C7052DB
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/builtin/array.v
View File

@ -601,7 +601,7 @@ pub fn (a &array) clone_to_depth(depth int) array {
}
return arr
} else {
if !isnil(a.data) {
if a.data != 0 {
unsafe { vmemcpy(&u8(arr.data), a.data, u64(a.cap) * u64(a.element_size)) }
}
return arr
@ -637,16 +637,15 @@ fn (mut a array) push(val voidptr) {
[unsafe]
pub fn (mut a3 array) push_many(val voidptr, size int) {
a3.ensure_cap(a3.len + size)
if a3.data == val && !isnil(a3.data) {
if a3.data == val && a3.data != 0 {
// handle `arr << arr`
copy := a3.clone()
unsafe {
// vmemcpy(a.data, copy.data, copy.element_size * copy.len)
vmemcpy(a3.get_unsafe(a3.len), copy.data, u64(a3.element_size) * u64(size))
vmemcpy(&u8(a3.data) + u64(a3.element_size) * u64(a3.len), copy.data, u64(a3.element_size) * u64(size))
}
} else {
if !isnil(a3.data) && !isnil(val) {
unsafe { vmemcpy(a3.get_unsafe(a3.len), val, u64(a3.element_size) * u64(size)) }
if a3.data != 0 && val != 0 {
unsafe { vmemcpy(&u8(a3.data) + u64(a3.element_size) * u64(a3.len), val, u64(a3.element_size) * u64(size)) }
}
}
a3.len += size

6
vlib/builtin/array_d_gcboehm_opt.v
View File

@ -210,7 +210,7 @@ fn (a &array) clone_to_depth_noscan(depth int) array {
}
return arr
} else {
if !isnil(a.data) {
if a.data != 0 {
unsafe { vmemcpy(&u8(arr.data), a.data, u64(a.cap) * u64(a.element_size)) }
}
return arr
@ -227,7 +227,7 @@ fn (mut a array) push_noscan(val voidptr) {
// `val` is array.data and user facing usage is `a << [1,2,3]`
[unsafe]
fn (mut a3 array) push_many_noscan(val voidptr, size int) {
if a3.data == val && !isnil(a3.data) {
if a3.data == val && a3.data != 0 {
// handle `arr << arr`
copy := a3.clone()
a3.ensure_cap_noscan(a3.len + size)
@ -236,7 +236,7 @@ fn (mut a3 array) push_many_noscan(val voidptr, size int) {
}
} else {
a3.ensure_cap_noscan(a3.len + size)
if !isnil(a3.data) && !isnil(val) {
if a3.data != 0 && val != 0 {
unsafe { vmemcpy(a3.get_unsafe(a3.len), val, u64(a3.element_size) * u64(size)) }
}
}