Skip to content

Commit 0a38dbb

Browse files
committed
Fix invalid memcpy definition in codegen test and UI tests
1 parent bea9065 commit 0a38dbb

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

tests/codegen-llvm/no_builtins-at-crate.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
#![no_builtins]
44
#![crate_type = "lib"]
55

6+
use std::ffi::c_void;
7+
68
// CHECK: define
79
// CHECK-SAME: @__aeabi_memcpy
810
// CHECK-SAME: #0
911
#[no_mangle]
10-
pub unsafe extern "C" fn __aeabi_memcpy(dest: *mut u8, src: *const u8, size: usize) {
12+
pub unsafe extern "C" fn __aeabi_memcpy(dest: *mut c_void, src: *const c_void, size: usize) {
1113
// CHECK: call
1214
// CHECK-SAME: @memcpy(
1315
memcpy(dest, src, size);
@@ -17,7 +19,7 @@ pub unsafe extern "C" fn __aeabi_memcpy(dest: *mut u8, src: *const u8, size: usi
1719
// CHECK-SAME: @memcpy
1820
// CHECK-SAME: #0
1921
extern "C" {
20-
pub fn memcpy(dest: *mut u8, src: *const u8, n: usize) -> *mut u8;
22+
pub fn memcpy(dest: *mut c_void, src: *const c_void, n: usize) -> *mut c_void;
2123
}
2224

2325
// CHECK: attributes #0

tests/ui/foreign/foreign-int-types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
mod xx {
66
extern "C" {
7-
pub fn strlen(str: *const u8) -> usize;
7+
pub fn strlen2(str: *const u8) -> usize;
88
pub fn foo(x: isize, y: usize);
99
}
1010
}

0 commit comments

Comments
 (0)