Skip to content

Commit 6c11e4a

Browse files
committed
Auto merge of #27624 - apasel422:issue-27620, r=Gankro
Closes #27620.
2 parents dc9b74f + 28d5d2f commit 6c11e4a

File tree

1 file changed

+23
-2
lines changed

1 file changed

+23
-2
lines changed

src/libcollections/btree/node.rs

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,29 @@ impl<K, V> Node<K, V> {
387387

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

394415
#[inline]

0 commit comments

Comments
 (0)