about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Kimock <kimockb@gmail.com>2024-04-19 18:36:54 -0400
committerBen Kimock <kimockb@gmail.com>2024-05-20 11:13:10 -0400
commit30379f9bcc8cc31610784024c7a1f1d4fb98f4c5 (patch)
tree7928e64278c87f9f5b9007bdbeb0abd3ddeca1b1
parentf45a7a291c4d32f3d8c2c9c67138e229677ddb38 (diff)
downloadrust-30379f9bcc8cc31610784024c7a1f1d4fb98f4c5.tar.gz
rust-30379f9bcc8cc31610784024c7a1f1d4fb98f4c5.zip
Update tests/incremental/foreign.rs
-rw-r--r--tests/incremental/foreign.rs27
1 files changed, 5 insertions, 22 deletions
diff --git a/tests/incremental/foreign.rs b/tests/incremental/foreign.rs
index cb040fe1296..1af203e9b77 100644
--- a/tests/incremental/foreign.rs
+++ b/tests/incremental/foreign.rs
@@ -1,38 +1,21 @@
 // Test what happens we save incremental compilation state that makes
 // use of foreign items. This used to ICE (#34991).
-//@ ignore-sgx no libc
-
 //@ revisions: rpass1
 
-#![feature(rustc_private)]
-
-extern crate libc;
-
 use std::ffi::CString;
 
 mod mlibc {
-    use libc::{c_char, c_long, c_longlong};
-
     extern "C" {
-        pub fn atol(x: *const c_char) -> c_long;
-        pub fn atoll(x: *const c_char) -> c_longlong;
+        // strlen is provided either by an external library or compiler-builtins as a fallback
+        pub fn strlen(x: *const std::ffi::c_char) -> usize;
     }
 }
 
-fn atol(s: String) -> isize {
-    let c = CString::new(s).unwrap();
-    unsafe { mlibc::atol(c.as_ptr()) as isize }
-}
-
-fn atoll(s: String) -> i64 {
+fn strlen(s: String) -> usize {
     let c = CString::new(s).unwrap();
-    unsafe { mlibc::atoll(c.as_ptr()) as i64 }
+    unsafe { mlibc::strlen(c.as_ptr()) }
 }
 
 pub fn main() {
-    assert_eq!(atol("1024".to_string()) * 10, atol("10240".to_string()));
-    assert_eq!(
-        (atoll("11111111111111111".to_string()) * 10),
-        atoll("111111111111111110".to_string())
-    );
+    assert_eq!(strlen("1024".to_string()), strlen("2048".to_string()));
 }