@@ -7,6 +7,9 @@ use alloc::{vec::Vec, string::String, boxed::Box, borrow::Borrow};
77use crate :: Buf ;
88use crate :: buf:: IntoIter ;
99use crate :: loom:: sync:: atomic:: { self , AtomicPtr , AtomicUsize , Ordering } ;
10+ #[ allow( unused) ]
11+ use crate :: loom:: sync:: atomic:: AtomicMut ;
12+
1013
1114/// A reference counted contiguous slice of memory.
1215///
@@ -854,16 +857,18 @@ unsafe fn promotable_even_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize
854857}
855858
856859unsafe fn promotable_even_drop ( data : & mut AtomicPtr < ( ) > , ptr : * const u8 , len : usize ) {
857- let shared = * data. get_mut ( ) ;
858- let kind = shared as usize & KIND_MASK ;
860+ data. with_mut ( |shared| {
861+ let shared = * shared;
862+ let kind = shared as usize & KIND_MASK ;
859863
860- if kind == KIND_ARC {
861- release_shared ( shared as * mut Shared ) ;
862- } else {
863- debug_assert_eq ! ( kind, KIND_VEC ) ;
864- let buf = ( shared as usize & !KIND_MASK ) as * mut u8 ;
865- drop ( rebuild_boxed_slice ( buf, ptr, len) ) ;
866- }
864+ if kind == KIND_ARC {
865+ release_shared ( shared as * mut Shared ) ;
866+ } else {
867+ debug_assert_eq ! ( kind, KIND_VEC ) ;
868+ let buf = ( shared as usize & !KIND_MASK ) as * mut u8 ;
869+ drop ( rebuild_boxed_slice ( buf, ptr, len) ) ;
870+ }
871+ } ) ;
867872}
868873
869874unsafe fn promotable_odd_clone ( data : & AtomicPtr < ( ) > , ptr : * const u8 , len : usize ) -> Bytes {
@@ -879,16 +884,18 @@ unsafe fn promotable_odd_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize)
879884}
880885
881886unsafe fn promotable_odd_drop ( data : & mut AtomicPtr < ( ) > , ptr : * const u8 , len : usize ) {
882- let shared = * data. get_mut ( ) ;
883- let kind = shared as usize & KIND_MASK ;
887+ data. with_mut ( |shared| {
888+ let shared = * shared;
889+ let kind = shared as usize & KIND_MASK ;
884890
885- if kind == KIND_ARC {
886- release_shared ( shared as * mut Shared ) ;
887- } else {
888- debug_assert_eq ! ( kind, KIND_VEC ) ;
891+ if kind == KIND_ARC {
892+ release_shared ( shared as * mut Shared ) ;
893+ } else {
894+ debug_assert_eq ! ( kind, KIND_VEC ) ;
889895
890- drop ( rebuild_boxed_slice ( shared as * mut u8 , ptr, len) ) ;
891- }
896+ drop ( rebuild_boxed_slice ( shared as * mut u8 , ptr, len) ) ;
897+ }
898+ } ) ;
892899}
893900
894901unsafe fn rebuild_boxed_slice ( buf : * mut u8 , offset : * const u8 , len : usize ) -> Box < [ u8 ] > {
@@ -925,8 +932,9 @@ unsafe fn shared_clone(data: &AtomicPtr<()>, ptr: *const u8, len: usize) -> Byte
925932}
926933
927934unsafe fn shared_drop ( data : & mut AtomicPtr < ( ) > , _ptr : * const u8 , _len : usize ) {
928- let shared = * data. get_mut ( ) ;
929- release_shared ( shared as * mut Shared ) ;
935+ data. with_mut ( |shared| {
936+ release_shared ( * shared as * mut Shared ) ;
937+ } ) ;
930938}
931939
932940unsafe fn shallow_clone_arc ( shared : * mut Shared , ptr : * const u8 , len : usize ) -> Bytes {
@@ -1062,7 +1070,7 @@ fn _split_off_must_use() {}
10621070// fuzz tests
10631071#[ cfg( all( test, loom) ) ]
10641072mod fuzz {
1065- use std :: sync:: Arc ;
1073+ use loom :: sync:: Arc ;
10661074 use loom:: thread;
10671075
10681076 use super :: Bytes ;
0 commit comments