changes from feedback

rust-lang · Nov 23, 2024 · 2eb0b10 · 2eb0b10
1 parent 214d8c2
commit 2eb0b10
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 68 deletions.
diff --git a/src/shims/unix/android/foreign_items.rs b/src/shims/unix/android/foreign_items.rs
@@ -2,7 +2,6 @@ use rustc_abi::ExternAbi;
 use rustc_span::Symbol;
 
 use crate::shims::unix::android::thread::prctl;
-use crate::shims::unix::foreign_items::EvalContextExt as _;
 use crate::shims::unix::linux::syscall::syscall;
 use crate::*;
 
@@ -21,22 +20,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     ) -> InterpResult<'tcx, EmulateItemResult> {
         let this = self.eval_context_mut();
         match link_name.as_str() {
-            // Querying system information
-            "sysconf" => {
-                let [val] =
-                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
-                let result = this.sysconf(val)?;
-                this.write_scalar(result, dest)?;
-            }
-
-            // String handling
-            "strerror_r" => {
-                let [errnum, buf, buflen] =
-                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
-                let result = this.strerror_r(errnum, buf, buflen)?;
-                this.write_scalar(result, dest)?;
-            }
-
             // Miscellaneous
             "__errno" => {
                 let [] = this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;

diff --git a/src/shims/unix/foreign_items.rs b/src/shims/unix/foreign_items.rs
@@ -137,6 +137,13 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 this.write_scalar(result, dest)?;
             }
 
+            "sysconf" => {
+                let [val] =
+                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
+                let result = this.sysconf(val)?;
+                this.write_scalar(result, dest)?;
+            }
+
             // File descriptors
             "read" => {
                 let [fd, buf, count] = this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
@@ -775,6 +782,14 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     this.write_null(dest)?;
                 }
             }
+
+            "strerror_r" => {
+                let [errnum, buf, buflen] =
+                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
+                let result = this.strerror_r(errnum, buf, buflen)?;
+                this.write_scalar(result, dest)?;
+            }
+
             "getrandom" => {
                 // This function is non-standard but exists with the same signature and behavior on
                 // Linux, FreeBSD and Solaris/Illumos.

diff --git a/src/shims/unix/freebsd/foreign_items.rs b/src/shims/unix/freebsd/foreign_items.rs
@@ -1,7 +1,6 @@
 use rustc_abi::ExternAbi;
 use rustc_span::Symbol;
 
-use crate::shims::unix::foreign_items::EvalContextExt as _;
 use crate::shims::unix::*;
 use crate::*;
 
@@ -76,22 +75,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 this.write_scalar(result, dest)?;
             }
 
-            // Querying system information
-            "sysconf" => {
-                let [val] =
-                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
-                let result = this.sysconf(val)?;
-                this.write_scalar(result, dest)?;
-            }
-
-            // String handling
-            "strerror_r" => {
-                let [errnum, buf, buflen] =
-                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
-                let result = this.strerror_r(errnum, buf, buflen)?;
-                this.write_scalar(result, dest)?;
-            }
-
             // Miscellaneous
             "__error" => {
                 let [] = this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;

diff --git a/src/shims/unix/linux/foreign_items.rs b/src/shims/unix/linux/foreign_items.rs
@@ -126,21 +126,13 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             }
 
             // String handling
-            "strerror_r" | "__xpg_strerror_r" => {
+            "__xpg_strerror_r" => {
                 let [errnum, buf, buflen] =
                     this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
                 let result = this.strerror_r(errnum, buf, buflen)?;
                 this.write_scalar(result, dest)?;
             }
 
-            // Querying system information
-            "sysconf" => {
-                let [val] =
-                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
-                let result = this.sysconf(val)?;
-                this.write_scalar(result, dest)?;
-            }
-
             // Dynamically invoked syscalls
             "syscall" => {
                 syscall(this, link_name, abi, args, dest)?;

diff --git a/src/shims/unix/macos/foreign_items.rs b/src/shims/unix/macos/foreign_items.rs
@@ -2,7 +2,6 @@ use rustc_abi::ExternAbi;
 use rustc_span::Symbol;
 
 use super::sync::EvalContextExt as _;
-use crate::shims::unix::foreign_items::EvalContextExt as _;
 use crate::shims::unix::*;
 use crate::*;
 
@@ -168,21 +167,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 this.write_scalar(stack_size, dest)?;
             }
 
-            "sysconf" => {
-                let [val] =
-                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
-                let result = this.sysconf(val)?;
-                this.write_scalar(result, dest)?;
-            }
-
-            // String handling
-            "strerror_r" => {
-                let [errnum, buf, buflen] =
-                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
-                let result = this.strerror_r(errnum, buf, buflen)?;
-                this.write_scalar(result, dest)?;
-            }
-
             // Threading
             "pthread_setname_np" => {
                 let [name] =

diff --git a/src/shims/unix/solarish/foreign_items.rs b/src/shims/unix/solarish/foreign_items.rs
@@ -57,14 +57,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 this.write_scalar(res, dest)?;
             }
 
-            // String handling
-            "strerror_r" => {
-                let [errnum, buf, buflen] =
-                    this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
-                let result = this.strerror_r(errnum, buf, buflen)?;
-                this.write_scalar(result, dest)?;
-            }
-
             // Miscellaneous
             "___errno" => {
                 let [] = this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
@@ -121,7 +113,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 this.write_null(dest)?;
             }
 
-            "sysconf" | "__sysconf_xpg7" => {
+            "__sysconf_xpg7" => {
                 let [val] =
                     this.check_shim(abi, ExternAbi::C { unwind: false }, link_name, args)?;
                 let result = this.sysconf(val)?;

diff --git a/tests/pass-dep/libc/libc-strerror_r.rs b/tests/pass-dep/libc/libc-strerror_r.rs
@@ -7,6 +7,7 @@ fn main() {
         let mut buf2 = vec![0u8; 64];
         assert_eq!(libc::strerror_r(-1i32, buf2.as_mut_ptr().cast(), buf2.len()), 0);
         let mut buf3 = vec![0u8; 32];
+        // we purposely fill not enough length of the buffer to trigger ERANGE.
         assert_eq!(libc::strerror_r(libc::E2BIG, buf3.as_mut_ptr().cast(), 2), libc::ERANGE);
     }
 }