panic if target platform is incorrect instead

This commit is contained in:
Christian Poveda
2020-02-22 09:02:25 -05:00
parent c2bcab55b0
commit 208665836e
2 changed files with 15 additions and 16 deletions
+11 -12
View File
@@ -368,18 +368,17 @@ fn check_no_isolation(&mut self, name: &str) -> InterpResult<'tcx> {
}
Ok(())
}
/// Helper function used inside the shims of foreign functions to check that the target
/// platform is `platform`. It returns an error using the `name` of the foreign function if
/// this is not the case.
fn check_platform(&mut self, platform: &str, name: &str) -> InterpResult<'tcx> {
if self.eval_context_mut().tcx.sess.target.target.target_os.to_lowercase() != platform {
throw_unsup_format!(
"`{}` is only available on the `{}` platform",
name,
platform,
)
}
Ok(())
/// Helper function used inside the shims of foreign functions to assert that the target
/// platform is `platform`. It panics showing a message with the `name` of the foreign function
/// if this is not the case.
fn assert_platform(&mut self, platform: &str, name: &str) {
assert_eq!(
self.eval_context_mut().tcx.sess.target.target.target_os.to_lowercase(),
platform,
"`{}` is only available on the `{}` platform",
name,
platform
)
}
/// Sets the last error variable.
+4 -4
View File
@@ -347,7 +347,7 @@ fn macos_stat(
) -> InterpResult<'tcx, i32> {
let this = self.eval_context_mut();
this.check_no_isolation("stat")?;
this.check_platform("macos", "stat")?;
this.assert_platform("macos", "stat");
// `stat` always follows symlinks.
this.macos_stat_or_lstat(true, path_op, buf_op)
}
@@ -360,7 +360,7 @@ fn macos_lstat(
) -> InterpResult<'tcx, i32> {
let this = self.eval_context_mut();
this.check_no_isolation("lstat")?;
this.check_platform("macos", "lstat")?;
this.assert_platform("macos", "lstat");
this.macos_stat_or_lstat(false, path_op, buf_op)
}
@@ -372,7 +372,7 @@ fn macos_fstat(
let this = self.eval_context_mut();
this.check_no_isolation("fstat")?;
this.check_platform("macos", "fstat")?;
this.assert_platform("macos", "fstat");
let fd = this.read_scalar(fd_op)?.to_i32()?;
@@ -416,7 +416,7 @@ fn linux_statx(
let this = self.eval_context_mut();
this.check_no_isolation("statx")?;
this.check_platform("linux", "statx")?;
this.assert_platform("linux", "statx");
let statxbuf_scalar = this.read_scalar(statxbuf_op)?.not_undef()?;
let pathname_scalar = this.read_scalar(pathname_op)?.not_undef()?;