Skip to content

Commit 28d5d2f

Browse files
committed
Remove transmute from btree::node::Node::as_slices_internal_mut
Closes #27620.
1 parent 3d69bec commit 28d5d2f

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

src/libcollections/btree/node.rs

+23-2
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,29 @@ impl<K, V> Node<K, V> {
390390

391391
#[inline]
392392
pub fn as_slices_internal_mut<'b>(&'b mut self) -> MutNodeSlice<'b, K, V> {
393-
// FIXME(#27620): Bad: This relies on structure layout!
394-
unsafe { mem::transmute(self.as_slices_internal()) }
393+
let len = self.len();
394+
let is_leaf = self.is_leaf();
395+
let keys = unsafe { slice::from_raw_parts_mut(*self.keys, len) };
396+
let vals = unsafe { slice::from_raw_parts_mut(*self.vals, len) };
397+
let edges: &mut [_] = if is_leaf {
398+
&mut []
399+
} else {
400+
unsafe {
401+
let data = match self.edges {
402+
None => heap::EMPTY as *mut Node<K,V>,
403+
Some(ref mut p) => **p as *mut Node<K,V>,
404+
};
405+
slice::from_raw_parts_mut(data, len + 1)
406+
}
407+
};
408+
MutNodeSlice {
409+
keys: keys,
410+
vals: vals,
411+
edges: edges,
412+
head_is_edge: true,
413+
tail_is_edge: true,
414+
has_edges: !is_leaf,
415+
}
395416
}
396417

397418
#[inline]

0 commit comments

Comments
 (0)