RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-10 05:37:35 +00:00
Code Issues Activity Actions

LibRegex: Avoid keeping track of checkpoints across forks

Browse source 
Doing so would increase memory consumption by quite a bit, since many
useless copies of the checkpoints hashmap would be created and later
thrown away.
This commit is contained in:
Ali Mohammad Pur 2021-09-06 16:53:06 +04:30 • committed by Ali Mohammad Pur
parent 645e29a88b
commit 88d148b46a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibRegex/RegexByteCode.cpp
View file

@ -871,17 +871,17 @@ ALWAYS_INLINE ExecutionResult OpCode_ResetRepeat::execute(MatchInput const&, Mat
return ExecutionResult::Continue; return ExecutionResult::Continue;
} }
ALWAYS_INLINE ExecutionResult OpCode_Checkpoint::execute(MatchInput const&, MatchState& state) const ALWAYS_INLINE ExecutionResult OpCode_Checkpoint::execute(MatchInput const& input, MatchState& state) const
{ {
state.checkpoints.set(state.instruction_position, state.string_position); input.checkpoints.set(state.instruction_position, state.string_position);
return ExecutionResult::Continue; return ExecutionResult::Continue;
} }
ALWAYS_INLINE ExecutionResult OpCode_JumpNonEmpty::execute(MatchInput const&, MatchState& state) const ALWAYS_INLINE ExecutionResult OpCode_JumpNonEmpty::execute(MatchInput const& input, MatchState& state) const
{ {
auto current_position = state.string_position; auto current_position = state.string_position;
auto checkpoint_ip = state.instruction_position + size() + checkpoint(); auto checkpoint_ip = state.instruction_position + size() + checkpoint();
if (state.checkpoints.get(checkpoint_ip).value_or(current_position) != current_position) { if (input.checkpoints.get(checkpoint_ip).value_or(current_position) != current_position) {
auto form = this->form(); auto form = this->form();
if (form == OpCodeId::Jump) { if (form == OpCodeId::Jump) {

2
Userland/Libraries/LibRegex/RegexMatch.h
View file

@ -513,6 +513,7 @@ struct MatchInput {
mutable size_t fail_counter { 0 }; mutable size_t fail_counter { 0 };
mutable Vector<size_t> saved_positions; mutable Vector<size_t> saved_positions;
mutable Vector<size_t> saved_code_unit_positions; mutable Vector<size_t> saved_code_unit_positions;
mutable HashMap<u64, u64> checkpoints;
}; };
struct MatchState { struct MatchState {
@ -524,7 +525,6 @@ struct MatchState {
Vector<Match> matches; Vector<Match> matches;
Vector<Vector<Match>> capture_group_matches; Vector<Vector<Match>> capture_group_matches;
Vector<u64> repetition_marks; Vector<u64> repetition_marks;
HashMap<u64, u64> checkpoints;
}; };
} }