beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

AK+Everywhere: Replace all Bitmap::must_create() uses with ::create()

Browse source 
Well, *someone* has to add some more FIXMEs to keep FIXME Roulette
going. :^)
This commit is contained in:
Sam Atkins 2022-12-20 16:45:07 +00:00 committed by Andreas Kling
parent bed5961fc2
commit 29733e65f8
Notes: sideshowbarker 2024-07-17 09:37:30 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/29733e65f8
Pull-request: https://github.com/SerenityOS/serenity/pull/16605
6 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
AK/Bitmap.h
View file

@ -35,11 +35,6 @@ public:
return bitmap; return bitmap;
} }
static Bitmap must_create(size_t size, bool default_value)
{
return MUST(create(size, default_value));
}
Bitmap() = default; Bitmap() = default;
Bitmap(u8* data, size_t size, bool is_owning = false) Bitmap(u8* data, size_t size, bool is_owning = false)

2
Kernel/Graphics/VirtIOGPU/GraphicsAdapter.cpp
View file

@ -31,7 +31,7 @@ NonnullLockRefPtr<VirtIOGraphicsAdapter> VirtIOGraphicsAdapter::initialize(PCI::
"VirtGPU Scratch Space"sv, "VirtGPU Scratch Space"sv,
Memory::Region::Access::ReadWrite)); Memory::Region::Access::ReadWrite));
auto active_context_ids = Bitmap::must_create(VREND_MAX_CTX, false); auto active_context_ids = MUST(Bitmap::create(VREND_MAX_CTX, false));
auto adapter = adopt_lock_ref(*new (nothrow) VirtIOGraphicsAdapter(device_identifier, move(active_context_ids), move(scratch_space_region))); auto adapter = adopt_lock_ref(*new (nothrow) VirtIOGraphicsAdapter(device_identifier, move(active_context_ids), move(scratch_space_region)));
adapter->initialize(); adapter->initialize();
MUST(adapter->initialize_adapter()); MUST(adapter->initialize_adapter());

42
Tests/AK/TestBitmap.cpp
View file

@ -16,14 +16,14 @@ TEST_CASE(construct_empty)
TEST_CASE(find_first_set) TEST_CASE(find_first_set)
{ {
auto bitmap = Bitmap::must_create(128, false); auto bitmap = MUST(Bitmap::create(128, false));
bitmap.set(69, true); bitmap.set(69, true);
EXPECT_EQ(bitmap.find_first_set().value(), 69u); EXPECT_EQ(bitmap.find_first_set().value(), 69u);
} }
TEST_CASE(find_first_unset) TEST_CASE(find_first_unset)
{ {
auto bitmap = Bitmap::must_create(128, true); auto bitmap = MUST(Bitmap::create(128, true));
bitmap.set(51, false); bitmap.set(51, false);
EXPECT_EQ(bitmap.find_first_unset().value(), 51u); EXPECT_EQ(bitmap.find_first_unset().value(), 51u);
} }
@ -31,7 +31,7 @@ TEST_CASE(find_first_unset)
TEST_CASE(find_one_anywhere_set) TEST_CASE(find_one_anywhere_set)
{ {
{ {
auto bitmap = Bitmap::must_create(168, false); auto bitmap = MUST(Bitmap::create(168, false));
bitmap.set(34, true); bitmap.set(34, true);
bitmap.set(97, true); bitmap.set(97, true);
EXPECT_EQ(bitmap.find_one_anywhere_set(0).value(), 34u); EXPECT_EQ(bitmap.find_one_anywhere_set(0).value(), 34u);
@ -48,7 +48,7 @@ TEST_CASE(find_one_anywhere_set)
EXPECT_EQ(bitmap.find_one_anywhere_set(128).value(), 34u); EXPECT_EQ(bitmap.find_one_anywhere_set(128).value(), 34u);
} }
{ {
auto bitmap = Bitmap::must_create(128 + 24, false); auto bitmap = MUST(Bitmap::create(128 + 24, false));
bitmap.set(34, true); bitmap.set(34, true);
bitmap.set(126, true); bitmap.set(126, true);
EXPECT_EQ(bitmap.find_one_anywhere_set(0).value(), 34u); EXPECT_EQ(bitmap.find_one_anywhere_set(0).value(), 34u);
@ -56,7 +56,7 @@ TEST_CASE(find_one_anywhere_set)
EXPECT_EQ(bitmap.find_one_anywhere_set(64).value(), 126u); EXPECT_EQ(bitmap.find_one_anywhere_set(64).value(), 126u);
} }
{ {
auto bitmap = Bitmap::must_create(32, false); auto bitmap = MUST(Bitmap::create(32, false));
bitmap.set(12, true); bitmap.set(12, true);
bitmap.set(24, true); bitmap.set(24, true);
auto got = bitmap.find_one_anywhere_set(0).value(); auto got = bitmap.find_one_anywhere_set(0).value();
@ -67,7 +67,7 @@ TEST_CASE(find_one_anywhere_set)
TEST_CASE(find_one_anywhere_unset) TEST_CASE(find_one_anywhere_unset)
{ {
{ {
auto bitmap = Bitmap::must_create(168, true); auto bitmap = MUST(Bitmap::create(168, true));
bitmap.set(34, false); bitmap.set(34, false);
bitmap.set(97, false); bitmap.set(97, false);
EXPECT_EQ(bitmap.find_one_anywhere_unset(0).value(), 34u); EXPECT_EQ(bitmap.find_one_anywhere_unset(0).value(), 34u);
@ -84,7 +84,7 @@ TEST_CASE(find_one_anywhere_unset)
EXPECT_EQ(bitmap.find_one_anywhere_unset(128).value(), 34u); EXPECT_EQ(bitmap.find_one_anywhere_unset(128).value(), 34u);
} }
{ {
auto bitmap = Bitmap::must_create(128 + 24, true); auto bitmap = MUST(Bitmap::create(128 + 24, true));
bitmap.set(34, false); bitmap.set(34, false);
bitmap.set(126, false); bitmap.set(126, false);
EXPECT_EQ(bitmap.find_one_anywhere_unset(0).value(), 34u); EXPECT_EQ(bitmap.find_one_anywhere_unset(0).value(), 34u);
@ -92,7 +92,7 @@ TEST_CASE(find_one_anywhere_unset)
EXPECT_EQ(bitmap.find_one_anywhere_unset(64).value(), 126u); EXPECT_EQ(bitmap.find_one_anywhere_unset(64).value(), 126u);
} }
{ {
auto bitmap = Bitmap::must_create(32, true); auto bitmap = MUST(Bitmap::create(32, true));
bitmap.set(12, false); bitmap.set(12, false);
bitmap.set(24, false); bitmap.set(24, false);
auto got = bitmap.find_one_anywhere_unset(0).value(); auto got = bitmap.find_one_anywhere_unset(0).value();
@ -102,7 +102,7 @@ TEST_CASE(find_one_anywhere_unset)
TEST_CASE(find_first_range) TEST_CASE(find_first_range)
{ {
auto bitmap = Bitmap::must_create(128, true); auto bitmap = MUST(Bitmap::create(128, true));
bitmap.set(47, false); bitmap.set(47, false);
bitmap.set(48, false); bitmap.set(48, false);
bitmap.set(49, false); bitmap.set(49, false);
@ -118,7 +118,7 @@ TEST_CASE(find_first_range)
TEST_CASE(set_range) TEST_CASE(set_range)
{ {
{ {
auto bitmap = Bitmap::must_create(128, false); auto bitmap = MUST(Bitmap::create(128, false));
bitmap.set_range(41, 10, true); bitmap.set_range(41, 10, true);
EXPECT_EQ(bitmap.get(40), false); EXPECT_EQ(bitmap.get(40), false);
EXPECT_EQ(bitmap.get(41), true); EXPECT_EQ(bitmap.get(41), true);
@ -134,7 +134,7 @@ TEST_CASE(set_range)
EXPECT_EQ(bitmap.get(51), false); EXPECT_EQ(bitmap.get(51), false);
} }
{ {
auto bitmap = Bitmap::must_create(288, false); auto bitmap = MUST(Bitmap::create(288, false));
bitmap.set_range(48, 32, true); bitmap.set_range(48, 32, true);
bitmap.set_range(94, 39, true); bitmap.set_range(94, 39, true);
bitmap.set_range(190, 71, true); bitmap.set_range(190, 71, true);
@ -152,12 +152,12 @@ TEST_CASE(set_range)
TEST_CASE(find_first_fit) TEST_CASE(find_first_fit)
{ {
{ {
auto bitmap = Bitmap::must_create(32, true); auto bitmap = MUST(Bitmap::create(32, true));
auto fit = bitmap.find_first_fit(1); auto fit = bitmap.find_first_fit(1);
EXPECT_EQ(fit.has_value(), false); EXPECT_EQ(fit.has_value(), false);
} }
{ {
auto bitmap = Bitmap::must_create(32, true); auto bitmap = MUST(Bitmap::create(32, true));
bitmap.set(31, false); bitmap.set(31, false);
auto fit = bitmap.find_first_fit(1); auto fit = bitmap.find_first_fit(1);
EXPECT_EQ(fit.has_value(), true); EXPECT_EQ(fit.has_value(), true);
@ -165,7 +165,7 @@ TEST_CASE(find_first_fit)
} }
for (size_t i = 0; i < 128; ++i) { for (size_t i = 0; i < 128; ++i) {
auto bitmap = Bitmap::must_create(128, true); auto bitmap = MUST(Bitmap::create(128, true));
bitmap.set(i, false); bitmap.set(i, false);
auto fit = bitmap.find_first_fit(1); auto fit = bitmap.find_first_fit(1);
EXPECT_EQ(fit.has_value(), true); EXPECT_EQ(fit.has_value(), true);
@ -173,7 +173,7 @@ TEST_CASE(find_first_fit)
} }
for (size_t i = 0; i < 127; ++i) { for (size_t i = 0; i < 127; ++i) {
auto bitmap = Bitmap::must_create(128, true); auto bitmap = MUST(Bitmap::create(128, true));
bitmap.set(i, false); bitmap.set(i, false);
bitmap.set(i + 1, false); bitmap.set(i + 1, false);
auto fit = bitmap.find_first_fit(2); auto fit = bitmap.find_first_fit(2);
@ -184,7 +184,7 @@ TEST_CASE(find_first_fit)
size_t bitmap_size = 1024; size_t bitmap_size = 1024;
for (size_t chunk_size = 1; chunk_size < 64; ++chunk_size) { for (size_t chunk_size = 1; chunk_size < 64; ++chunk_size) {
for (size_t i = 0; i < bitmap_size - chunk_size; ++i) { for (size_t i = 0; i < bitmap_size - chunk_size; ++i) {
auto bitmap = Bitmap::must_create(bitmap_size, true); auto bitmap = MUST(Bitmap::create(bitmap_size, true));
for (size_t c = 0; c < chunk_size; ++c) for (size_t c = 0; c < chunk_size; ++c)
bitmap.set(i + c, false); bitmap.set(i + c, false);
auto fit = bitmap.find_first_fit(chunk_size); auto fit = bitmap.find_first_fit(chunk_size);
@ -196,7 +196,7 @@ TEST_CASE(find_first_fit)
TEST_CASE(find_longest_range_of_unset_bits_edge) TEST_CASE(find_longest_range_of_unset_bits_edge)
{ {
auto bitmap = Bitmap::must_create(36, true); auto bitmap = MUST(Bitmap::create(36, true));
bitmap.set_range(32, 4, false); bitmap.set_range(32, 4, false);
size_t found_range_size = 0; size_t found_range_size = 0;
auto result = bitmap.find_longest_range_of_unset_bits(1, found_range_size); auto result = bitmap.find_longest_range_of_unset_bits(1, found_range_size);
@ -206,7 +206,7 @@ TEST_CASE(find_longest_range_of_unset_bits_edge)
TEST_CASE(count_in_range) TEST_CASE(count_in_range)
{ {
auto bitmap = Bitmap::must_create(256, false); auto bitmap = MUST(Bitmap::create(256, false));
bitmap.set(14, true); bitmap.set(14, true);
bitmap.set(17, true); bitmap.set(17, true);
bitmap.set(19, true); bitmap.set(19, true);
@ -252,14 +252,14 @@ TEST_CASE(count_in_range)
TEST_CASE(byte_aligned_access) TEST_CASE(byte_aligned_access)
{ {
{ {
auto bitmap = Bitmap::must_create(16, true); auto bitmap = MUST(Bitmap::create(16, true));
EXPECT_EQ(bitmap.count_in_range(0, 16, true), 16u); EXPECT_EQ(bitmap.count_in_range(0, 16, true), 16u);
EXPECT_EQ(bitmap.count_in_range(8, 8, true), 8u); EXPECT_EQ(bitmap.count_in_range(8, 8, true), 8u);
EXPECT_EQ(bitmap.count_in_range(0, 8, true), 8u); EXPECT_EQ(bitmap.count_in_range(0, 8, true), 8u);
EXPECT_EQ(bitmap.count_in_range(4, 8, true), 8u); EXPECT_EQ(bitmap.count_in_range(4, 8, true), 8u);
} }
{ {
auto bitmap = Bitmap::must_create(16, false); auto bitmap = MUST(Bitmap::create(16, false));
bitmap.set_range(4, 8, true); bitmap.set_range(4, 8, true);
EXPECT_EQ(bitmap.count_in_range(0, 16, true), 8u); EXPECT_EQ(bitmap.count_in_range(0, 16, true), 8u);
EXPECT_EQ(bitmap.count_in_range(8, 8, true), 4u); EXPECT_EQ(bitmap.count_in_range(8, 8, true), 4u);
@ -267,7 +267,7 @@ TEST_CASE(byte_aligned_access)
EXPECT_EQ(bitmap.count_in_range(4, 8, true), 8u); EXPECT_EQ(bitmap.count_in_range(4, 8, true), 8u);
} }
{ {
auto bitmap = Bitmap::must_create(8, false); auto bitmap = MUST(Bitmap::create(8, false));
bitmap.set(2, true); bitmap.set(2, true);
bitmap.set(4, true); bitmap.set(4, true);
EXPECT_EQ(bitmap.count_in_range(0, 2, true), 0u); EXPECT_EQ(bitmap.count_in_range(0, 2, true), 0u);

2
Userland/DevTools/Profiler/Profile.h
View file

@ -48,7 +48,7 @@ public:
void will_track_seen_events(size_t profile_event_count) void will_track_seen_events(size_t profile_event_count)
{ {
if (m_seen_events.size() != profile_event_count) if (m_seen_events.size() != profile_event_count)
m_seen_events = Bitmap::must_create(profile_event_count, false); m_seen_events = Bitmap::create(profile_event_count, false).release_value_but_fixme_should_propagate_errors();
} }
bool has_seen_event(size_t event_index) const { return m_seen_events.get(event_index); } bool has_seen_event(size_t event_index) const { return m_seen_events.get(event_index); }
void did_see_event(size_t event_index) { m_seen_events.set(event_index, true); } void did_see_event(size_t event_index) { m_seen_events.set(event_index, true); }

2
Userland/Libraries/LibGfx/Bitmap.cpp
View file

@ -655,7 +655,7 @@ void Bitmap::flood_visit_from_point(Gfx::IntPoint start_point, int threshold,
points_to_visit.enqueue(start_point); points_to_visit.enqueue(start_point);
pixel_reached(start_point); pixel_reached(start_point);
auto flood_mask = AK::Bitmap::must_create(width() * height(), false); auto flood_mask = AK::Bitmap::create(width() * height(), false).release_value_but_fixme_should_propagate_errors();
flood_mask.set(width() * start_point.y() + start_point.x(), true); flood_mask.set(width() * start_point.y() + start_point.x(), true);

2
Userland/Libraries/LibJS/Bytecode/Pass/LoadElimination.cpp
View file

@ -13,7 +13,7 @@ namespace JS::Bytecode::Passes {
static NonnullOwnPtr<BasicBlock> eliminate_loads(BasicBlock const& block, size_t number_of_registers) static NonnullOwnPtr<BasicBlock> eliminate_loads(BasicBlock const& block, size_t number_of_registers)
{ {
auto array_ranges = Bitmap::must_create(number_of_registers, false); auto array_ranges = Bitmap::create(number_of_registers, false).release_value_but_fixme_should_propagate_errors();
for (auto it = InstructionStreamIterator(block.instruction_stream()); !it.at_end(); ++it) { for (auto it = InstructionStreamIterator(block.instruction_stream()); !it.at_end(); ++it) {
if ((*it).type() == Instruction::Type::NewArray) { if ((*it).type() == Instruction::Type::NewArray) {