blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

BLI: Destroy non-trivial types after using remove_if #115914

Merged
Jacques Lucke merged 6 commits from guishe/blender:remove-if-free into main 2023-12-12 10:42:14 +01:00
Conversation 2 Commits 6 Files Changed 2 +12
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/BLI_vector.hh
View File

@ -816,6 +816,7 @@ class Vector {
{
const T *prev_end = this->end();
end_ = std::remove_if(this->begin(), this->end(), predicate);
destruct_n(end_, prev_end - end_);
UPDATE_VECTOR_SIZE(this);
return int64_t(prev_end - end_);
}

11
source/blender/blenlib/tests/BLI_vector_test.cc
View File

@ -431,6 +431,17 @@ TEST(vector, RemoveIf)
EXPECT_EQ_ARRAY(vec.data(), expected_vec.data(), size_t(vec.size()));
}
TEST(vector, RemoveIfNonTrivialDestructible)
{
Vector<Vector<int, 0, GuardedAllocator>> vec;
for ([[maybe_unused]] const int64_t i : IndexRange(10)) {
/* This test relies on leak detection to run after tests. */
vec.append(Vector<int, 0, GuardedAllocator>(100));
}
vec.remove_if([&](const auto & /*value*/) { return true; });
EXPECT_TRUE(vec.is_empty());
}
TEST(vector, ExtendSmallVector)
{
Vector<int> a = {2, 3, 4};