Skip to content

Commit 6b7d515

Browse files
committed
chore: unix clippy happy
1 parent 48cd132 commit 6b7d515

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

pd-vm/src/vm/jit/native/cranelift.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ struct ResolvedOffsets {
169169
}
170170

171171
pub(crate) fn helper_entry_address() -> usize {
172-
pd_vm_cranelift_step as usize
172+
pd_vm_cranelift_step as *const () as usize
173173
}
174174

175175
pub(crate) fn layout_fingerprint() -> VmResult<u64> {

pd-vm/src/vm/jit/native/exec.rs

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,16 @@ unsafe fn flush_instruction_cache(ptr: *mut u8, len: usize) {
9999

100100
#[cfg(unix)]
101101
unsafe fn alloc_executable(len: usize) -> VmResult<*mut u8> {
102-
let ptr = libc::mmap(
103-
std::ptr::null_mut(),
104-
len,
105-
libc::PROT_READ | libc::PROT_WRITE | libc::PROT_EXEC,
106-
libc::MAP_PRIVATE | map_anon_flag(),
107-
-1,
108-
0,
109-
);
102+
let ptr = unsafe {
103+
libc::mmap(
104+
std::ptr::null_mut(),
105+
len,
106+
libc::PROT_READ | libc::PROT_WRITE | libc::PROT_EXEC,
107+
libc::MAP_PRIVATE | map_anon_flag(),
108+
-1,
109+
0,
110+
)
111+
};
110112
if ptr == libc::MAP_FAILED {
111113
return Err(VmError::JitNative(
112114
"mmap failed for executable trace buffer".to_string(),
@@ -117,18 +119,20 @@ unsafe fn alloc_executable(len: usize) -> VmResult<*mut u8> {
117119

118120
#[cfg(unix)]
119121
unsafe fn free_executable(ptr: *mut u8, len: usize) {
120-
let _ = libc::munmap(ptr.cast(), len);
122+
let _ = unsafe { libc::munmap(ptr.cast(), len) };
121123
}
122124

123125
#[cfg(unix)]
124126
unsafe fn flush_instruction_cache(ptr: *mut u8, len: usize) {
127+
let _ = (ptr, len);
128+
125129
#[cfg(all(target_arch = "aarch64", target_os = "macos"))]
126130
{
127131
unsafe extern "C" {
128132
fn sys_icache_invalidate(start: *mut core::ffi::c_void, len: usize);
129133
}
130134

131-
sys_icache_invalidate(ptr.cast(), len);
135+
unsafe { sys_icache_invalidate(ptr.cast(), len) };
132136
}
133137

134138
#[cfg(all(target_arch = "aarch64", not(target_os = "macos")))]
@@ -137,7 +141,7 @@ unsafe fn flush_instruction_cache(ptr: *mut u8, len: usize) {
137141
fn __clear_cache(start: *mut u8, end: *mut u8);
138142
}
139143

140-
__clear_cache(ptr, ptr.add(len));
144+
unsafe { __clear_cache(ptr, ptr.add(len)) };
141145
}
142146
}
143147

0 commit comments

Comments
 (0)