diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index 95062d84e09..d80385587da 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -26,7 +26,7 @@ extern crate collections; -use std::cast::{transmute, transmute_mut, transmute_mut_lifetime}; +use std::cast::{transmute, transmute_mut_lifetime}; use std::cast; use std::cell::{Cell, RefCell}; use std::mem; @@ -281,8 +281,8 @@ impl Arena { #[inline] pub fn alloc<'a, T>(&'a self, op: || -> T) -> &'a T { unsafe { - // FIXME: Borrow check - let this = transmute_mut(self); + // FIXME #13933: Remove/justify all `&T` to `&mut T` transmutes + let this: &mut Arena = transmute::<&_, &mut _>(self); if intrinsics::needs_drop::() { this.alloc_noncopy(op) } else { @@ -438,7 +438,8 @@ impl TypedArena { #[inline] pub fn alloc<'a>(&'a self, object: T) -> &'a T { unsafe { - let this = cast::transmute_mut(self); + // FIXME #13933: Remove/justify all `&T` to `&mut T` transmutes + let this: &mut TypedArena = cast::transmute::<&_, &mut _>(self); if this.ptr == this.end { this.grow() } diff --git a/src/libnative/io/file_win32.rs b/src/libnative/io/file_win32.rs index 88ba6dcbc7e..aae15a86614 100644 --- a/src/libnative/io/file_win32.rs +++ b/src/libnative/io/file_win32.rs @@ -174,7 +174,8 @@ impl rtio::RtioFileStream for FileDesc { fn tell(&self) -> Result { // This transmute is fine because our seek implementation doesn't // actually use the mutable self at all. - unsafe { cast::transmute_mut(self).seek(0, io::SeekCur) } + // FIXME #13933: Remove/justify all `&T` to `&mut T` transmutes + unsafe { cast::transmute::<&_, &mut FileDesc>(self).seek(0, io::SeekCur) } } fn fsync(&mut self) -> Result<(), IoError> { diff --git a/src/librustuv/file.rs b/src/librustuv/file.rs index 665d418ab2a..9037363f9a0 100644 --- a/src/librustuv/file.rs +++ b/src/librustuv/file.rs @@ -445,7 +445,8 @@ impl rtio::RtioFileStream for FileWatcher { fn tell(&self) -> Result { use libc::SEEK_CUR; // this is temporary - let self_ = unsafe { cast::transmute_mut(self) }; + // FIXME #13933: Remove/justify all `&T` to `&mut T` transmutes + let self_ = unsafe { cast::transmute::<&_, &mut FileWatcher>(self) }; self_.seek_common(0, SEEK_CUR) } fn fsync(&mut self) -> Result<(), IoError> { diff --git a/src/libstd/cast.rs b/src/libstd/cast.rs index bcbf804d7b3..7a8f517bbf9 100644 --- a/src/libstd/cast.rs +++ b/src/libstd/cast.rs @@ -60,6 +60,7 @@ pub unsafe fn transmute(thing: L) -> G { /// Coerce an immutable reference to be mutable. #[inline] +#[deprecated="casting &T to &mut T is undefined behaviour: use Cell, RefCell or Unsafe"] pub unsafe fn transmute_mut<'a,T>(ptr: &'a T) -> &'a mut T { transmute(ptr) } /// Coerce a reference to have an arbitrary associated lifetime. diff --git a/src/libstd/comm/mod.rs b/src/libstd/comm/mod.rs index 92e3e82c1c5..bbe34d20f6a 100644 --- a/src/libstd/comm/mod.rs +++ b/src/libstd/comm/mod.rs @@ -318,6 +318,11 @@ mod stream; mod shared; mod sync; +// FIXME #13933: Remove/justify all `&T` to `&mut T` transmutes +unsafe fn transmute_mut<'a,T>(x: &'a T) -> &'a mut T { + cast::transmute::<&_, &mut _>(x) +} + // Use a power of 2 to allow LLVM to optimize to something that's not a // division, this is hit pretty regularly. static RESCHED_FREQ: int = 256; @@ -565,7 +570,7 @@ impl Sender { unsafe { let mut tmp = Sender::new(Stream(new_inner)); - mem::swap(&mut cast::transmute_mut(self).inner, &mut tmp.inner); + mem::swap(&mut transmute_mut(self).inner, &mut tmp.inner); } return ret; } @@ -599,7 +604,7 @@ impl Clone for Sender { (*packet.get()).inherit_blocker(sleeper); let mut tmp = Sender::new(Shared(packet.clone())); - mem::swap(&mut cast::transmute_mut(self).inner, &mut tmp.inner); + mem::swap(&mut transmute_mut(self).inner, &mut tmp.inner); } Sender::new(Shared(packet)) } @@ -790,7 +795,7 @@ impl Receiver { } }; unsafe { - mem::swap(&mut cast::transmute_mut(self).inner, + mem::swap(&mut transmute_mut(self).inner, &mut new_port.inner); } } @@ -837,7 +842,7 @@ impl Receiver { Sync(ref p) => return unsafe { (*p.get()).recv() } }; unsafe { - mem::swap(&mut cast::transmute_mut(self).inner, + mem::swap(&mut transmute_mut(self).inner, &mut new_port.inner); } } @@ -874,7 +879,7 @@ impl select::Packet for Receiver { } }; unsafe { - mem::swap(&mut cast::transmute_mut(self).inner, + mem::swap(&mut transmute_mut(self).inner, &mut new_port.inner); } } @@ -906,7 +911,7 @@ impl select::Packet for Receiver { }; task = t; unsafe { - mem::swap(&mut cast::transmute_mut(self).inner, + mem::swap(&mut transmute_mut(self).inner, &mut new_port.inner); } } @@ -930,7 +935,7 @@ impl select::Packet for Receiver { let mut new_port = match result { Ok(b) => return b, Err(p) => p }; was_upgrade = true; unsafe { - mem::swap(&mut cast::transmute_mut(self).inner, + mem::swap(&mut transmute_mut(self).inner, &mut new_port.inner); } } diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs index bc6e324a5f7..e5c7ba4aa54 100644 --- a/src/libstd/local_data.rs +++ b/src/libstd/local_data.rs @@ -196,11 +196,11 @@ pub fn get_mut(key: Key, f: |Option<&mut T>| -> U) -> U { match x { None => f(None), // We're violating a lot of compiler guarantees with this - // invocation of `transmute_mut`, but we're doing runtime checks to + // invocation of `transmute`, but we're doing runtime checks to // ensure that it's always valid (only one at a time). // // there is no need to be upset! - Some(x) => { f(Some(unsafe { cast::transmute_mut(x) })) } + Some(x) => { f(Some(unsafe { cast::transmute::<&_, &mut _>(x) })) } } }) } diff --git a/src/libstd/slice.rs b/src/libstd/slice.rs index cb8550d248e..d8c866ef44a 100644 --- a/src/libstd/slice.rs +++ b/src/libstd/slice.rs @@ -1739,7 +1739,9 @@ impl<'a,T> MutableVector<'a, T> for &'a mut [T] { if self.len() == 0 { return None; } unsafe { let s: &mut Slice = transmute(self); - Some(cast::transmute_mut(&*raw::shift_ptr(s))) + // FIXME #13933: this `&` -> `&mut` cast is a little + // dubious + Some(&mut *(raw::shift_ptr(s) as *mut _)) } } @@ -1747,7 +1749,9 @@ impl<'a,T> MutableVector<'a, T> for &'a mut [T] { if self.len() == 0 { return None; } unsafe { let s: &mut Slice = transmute(self); - Some(cast::transmute_mut(&*raw::pop_ptr(s))) + // FIXME #13933: this `&` -> `&mut` cast is a little + // dubious + Some(&mut *(raw::pop_ptr(s) as *mut _)) } } @@ -3108,23 +3112,23 @@ mod tests { #[should_fail] fn test_from_elem_fail() { use cast; + use cell::Cell; use rc::Rc; struct S { - f: int, + f: Cell, boxes: (~int, Rc) } impl Clone for S { fn clone(&self) -> S { - let s = unsafe { cast::transmute_mut(self) }; - s.f += 1; - if s.f == 10 { fail!() } - S { f: s.f, boxes: s.boxes.clone() } + self.f.set(self.f.get() + 1); + if self.f.get() == 10 { fail!() } + S { f: self.f, boxes: self.boxes.clone() } } } - let s = S { f: 0, boxes: (box 0, Rc::new(0)) }; + let s = S { f: Cell::new(0), boxes: (box 0, Rc::new(0)) }; let _ = Vec::from_elem(100, s); } diff --git a/src/libsync/arc.rs b/src/libsync/arc.rs index b5c66075952..f5369ec862f 100644 --- a/src/libsync/arc.rs +++ b/src/libsync/arc.rs @@ -148,7 +148,7 @@ impl Arc { // reference count is guaranteed to be 1 at this point, and we required // the Arc itself to be `mut`, so we're returning the only possible // reference to the inner data. - unsafe { cast::transmute_mut(self.deref()) } + unsafe { cast::transmute::<&_, &mut _>(self.deref()) } } }