Skip to content

Remove redundant initialization in Table::allocate #25353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JaySpruce wants to merge 4 commits into
base: main
Choose a base branch
from
+9 −20
Open

Remove redundant initialization in Table::allocate #25353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b51a87
remove redundant initializing in `Table::allocate`
JaySpruce Aug 10, 2026
18876f3
don't dereference uninitialized memory
JaySpruce Aug 10, 2026
1670803
semicolon
JaySpruce Aug 10, 2026
1bda98d
Merge branch 'main' into remove_redundant_init
JaySpruce Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions crates/bevy_ecs/src/storage/table/column.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,16 @@ impl Column {
caller: MaybeLocation,
) {
self.data.initialize_unchecked(row.index(), data);
*self.added_ticks.get_unchecked_mut(row.index()).get_mut() = tick;
*self.changed_ticks.get_unchecked_mut(row.index()).get_mut() = tick;
self.added_ticks
.initialize_unchecked(row.index(), UnsafeCell::new(tick));
self.changed_ticks
.initialize_unchecked(row.index(), UnsafeCell::new(tick));
self.changed_by
.as_mut()
.map(|changed_by| changed_by.get_unchecked_mut(row.index()).get_mut())
.assign(caller);
.zip(caller)
.map(|(changed_by, caller)| {
changed_by.initialize_unchecked(row.index(), UnsafeCell::new(caller));
});
if let Some(summary_tick) = &self.summary_tick {
summary_tick.set(tick);
}
Expand Down
17 changes: 1 addition & 16 deletions crates/bevy_ecs/src/storage/table/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,25 +491,10 @@ impl Table {
/// The allocated row must be written to immediately with valid values in each column
pub(crate) unsafe fn allocate(&mut self, entity: Entity) -> TableRow {
self.reserve(1);
let len = self.entity_count();
// SAFETY: No entity index may be in more than one table row at once, so there are no duplicates,
// and there can not be an entity index of u32::MAX. Therefore, this can not be max either.
let row = unsafe { TableRow::new(NonMaxU32::new_unchecked(len)) };
let len = len as usize;
let row = unsafe { TableRow::new(NonMaxU32::new_unchecked(self.entity_count())) };
self.entities.push(entity);
for col in self.columns.values_mut() {
col.added_ticks
.initialize_unchecked(len, UnsafeCell::new(Tick::new(0)));
col.changed_ticks
.initialize_unchecked(len, UnsafeCell::new(Tick::new(0)));
col.changed_by
.as_mut()
.zip(MaybeLocation::caller())
.map(|(changed_by, caller)| {
changed_by.initialize_unchecked(len, UnsafeCell::new(caller));
});
}

row
}

Expand Down