From d11315ebfb4c2d95a1ca6c52bec105237b10e933 Mon Sep 17 00:00:00 2001 From: David Cook Date: Sun, 15 Mar 2020 15:10:08 -0500 Subject: [PATCH] Fix misleading function names --- src/shims/sync.rs | 32 ++++++++++++++++---------------- tests/run-pass/sync.rs | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/shims/sync.rs b/src/shims/sync.rs index 320872773031..22e62beae2f2 100644 --- a/src/shims/sync.rs +++ b/src/shims/sync.rs @@ -13,7 +13,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_mutexattr_init(&mut self, attr_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, attr_op, 4)?; + assert_ptr_target_min_size(this, attr_op, 4)?; let attr = this.read_scalar(attr_op)?.not_undef()?; if this.is_null(attr)? { @@ -36,7 +36,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx ) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, attr_op, 4)?; + assert_ptr_target_min_size(this, attr_op, 4)?; let attr = this.read_scalar(attr_op)?.not_undef()?; if this.is_null(attr)? { @@ -62,7 +62,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_mutexattr_destroy(&mut self, attr_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, attr_op, 4)?; + assert_ptr_target_min_size(this, attr_op, 4)?; let attr = this.read_scalar(attr_op)?.not_undef()?; if this.is_null(attr)? { @@ -92,8 +92,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx ) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, mutex_op, 16)?; - check_ptr_target_min_size(this, attr_op, 4)?; + assert_ptr_target_min_size(this, mutex_op, 16)?; + assert_ptr_target_min_size(this, attr_op, 4)?; let mutex = this.read_scalar(mutex_op)?.not_undef()?; if this.is_null(mutex)? { @@ -125,7 +125,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_mutex_lock(&mut self, mutex_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, mutex_op, 16)?; + assert_ptr_target_min_size(this, mutex_op, 16)?; let mutex = this.read_scalar(mutex_op)?.not_undef()?; if this.is_null(mutex)? { @@ -166,7 +166,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_mutex_trylock(&mut self, mutex_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, mutex_op, 16)?; + assert_ptr_target_min_size(this, mutex_op, 16)?; let mutex = this.read_scalar(mutex_op)?.not_undef()?; if this.is_null(mutex)? { @@ -201,7 +201,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_mutex_unlock(&mut self, mutex_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, mutex_op, 16)?; + assert_ptr_target_min_size(this, mutex_op, 16)?; let mutex = this.read_scalar(mutex_op)?.not_undef()?; if this.is_null(mutex)? { @@ -246,7 +246,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_mutex_destroy(&mut self, mutex_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, mutex_op, 16)?; + assert_ptr_target_min_size(this, mutex_op, 16)?; let mutex = this.read_scalar(mutex_op)?.not_undef()?; if this.is_null(mutex)? { @@ -277,7 +277,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_rwlock_rdlock(&mut self, rwlock_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, rwlock_op, 12)?; + assert_ptr_target_min_size(this, rwlock_op, 12)?; let rwlock = this.read_scalar(rwlock_op)?.not_undef()?; if this.is_null(rwlock)? { @@ -301,7 +301,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_rwlock_tryrdlock(&mut self, rwlock_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, rwlock_op, 12)?; + assert_ptr_target_min_size(this, rwlock_op, 12)?; let rwlock = this.read_scalar(rwlock_op)?.not_undef()?; if this.is_null(rwlock)? { @@ -325,7 +325,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_rwlock_wrlock(&mut self, rwlock_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, rwlock_op, 12)?; + assert_ptr_target_min_size(this, rwlock_op, 12)?; let rwlock = this.read_scalar(rwlock_op)?.not_undef()?; if this.is_null(rwlock)? { @@ -351,7 +351,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_rwlock_trywrlock(&mut self, rwlock_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, rwlock_op, 12)?; + assert_ptr_target_min_size(this, rwlock_op, 12)?; let rwlock = this.read_scalar(rwlock_op)?.not_undef()?; if this.is_null(rwlock)? { @@ -375,7 +375,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_rwlock_unlock(&mut self, rwlock_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, rwlock_op, 12)?; + assert_ptr_target_min_size(this, rwlock_op, 12)?; let rwlock = this.read_scalar(rwlock_op)?.not_undef()?; if this.is_null(rwlock)? { @@ -402,7 +402,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx fn pthread_rwlock_destroy(&mut self, rwlock_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> { let this = self.eval_context_mut(); - check_ptr_target_min_size(this, rwlock_op, 12)?; + assert_ptr_target_min_size(this, rwlock_op, 12)?; let rwlock = this.read_scalar(rwlock_op)?.not_undef()?; if this.is_null(rwlock)? { @@ -427,7 +427,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx } } -fn check_ptr_target_min_size<'mir, 'tcx: 'mir>(ecx: &MiriEvalContext<'mir, 'tcx>, operand: OpTy<'tcx, Tag>, min_size: u64) -> InterpResult<'tcx, ()> { +fn assert_ptr_target_min_size<'mir, 'tcx: 'mir>(ecx: &MiriEvalContext<'mir, 'tcx>, operand: OpTy<'tcx, Tag>, min_size: u64) -> InterpResult<'tcx, ()> { let target_ty = match operand.layout.ty.kind { TyKind::RawPtr(TypeAndMut{ ty, mutbl: _ }) => ty, _ => panic!("Argument to pthread function was not a raw pointer"), diff --git a/tests/run-pass/sync.rs b/tests/run-pass/sync.rs index b24706108379..c1e44789aa74 100644 --- a/tests/run-pass/sync.rs +++ b/tests/run-pass/sync.rs @@ -10,7 +10,7 @@ fn main() { { test_mutex_libc_recursive(); test_rwlock_stdlib(); - test_rwlock_libc_init(); + test_mutex_libc_init(); test_rwlock_libc_static_initializer(); } } @@ -68,7 +68,7 @@ fn test_rwlock_stdlib() { // std::sys::unix::rwlock::RWLock keeps track of write_locked and num_readers #[cfg(not(target_os = "windows"))] -fn test_rwlock_libc_init() { +fn test_mutex_libc_init() { unsafe { let mut mutex: libc::pthread_mutex_t = std::mem::zeroed(); assert_eq!(libc::pthread_mutex_init(&mut mutex as *mut _, std::ptr::null_mut()), 0);