diff --git a/Userland/Libraries/LibRegex/RegexByteCode.cpp b/Userland/Libraries/LibRegex/RegexByteCode.cpp index 5d2b1eaa94..ded6ff79ea 100644 --- a/Userland/Libraries/LibRegex/RegexByteCode.cpp +++ b/Userland/Libraries/LibRegex/RegexByteCode.cpp @@ -871,17 +871,17 @@ ALWAYS_INLINE ExecutionResult OpCode_ResetRepeat::execute(MatchInput const&, Mat 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; } -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 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(); if (form == OpCodeId::Jump) { diff --git a/Userland/Libraries/LibRegex/RegexMatch.h b/Userland/Libraries/LibRegex/RegexMatch.h index 035a988234..efd5bd0e4a 100644 --- a/Userland/Libraries/LibRegex/RegexMatch.h +++ b/Userland/Libraries/LibRegex/RegexMatch.h @@ -513,6 +513,7 @@ struct MatchInput { mutable size_t fail_counter { 0 }; mutable Vector saved_positions; mutable Vector saved_code_unit_positions; + mutable HashMap checkpoints; }; struct MatchState { @@ -524,7 +525,6 @@ struct MatchState { Vector matches; Vector> capture_group_matches; Vector repetition_marks; - HashMap checkpoints; }; }