Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-09 17:44:56 +09:00
Code Activity

LibRegex: Remove orphaned save points in nested LookAhead

Browse source
This commit is contained in:
mikiubo 2025-03-12 13:53:44 +01:00 • committed by Ali Mohammad Pur
parent 80d7350ee5
commit f2678bfcb8
Notes: github-actions[bot] 2025-03-14 08:42:39 +00:00
3 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibRegex/RegexByteCode.cpp
View file

@ -217,6 +217,12 @@ ALWAYS_INLINE ExecutionResult OpCode_FailForks::execute(MatchInput const& input,
input.fail_counter += state.forks_since_last_save;
return ExecutionResult::Failed_ExecuteLowPrioForks;
}
ALWAYS_INLINE ExecutionResult OpCode_PopSaved::execute(MatchInput const& input, MatchState&) const
{
input.saved_positions.take_last();
input.saved_code_unit_positions.take_last();
return ExecutionResult::Failed_ExecuteLowPrioForks;
}
ALWAYS_INLINE ExecutionResult OpCode_Jump::execute(MatchInput const&, MatchState& state) const
{

15
Libraries/LibRegex/RegexByteCode.h
View file

@ -31,6 +31,7 @@ using ByteCodeValueType = u64;
__ENUMERATE_OPCODE(ForkReplaceJump) \
__ENUMERATE_OPCODE(ForkReplaceStay) \
__ENUMERATE_OPCODE(FailForks) \
__ENUMERATE_OPCODE(PopSaved) \
__ENUMERATE_OPCODE(SaveLeftCaptureGroup) \
__ENUMERATE_OPCODE(SaveRightCaptureGroup) \
__ENUMERATE_OPCODE(SaveRightNamedCaptureGroup) \
@ -266,9 +267,15 @@ public:
switch (type) {
case LookAroundType::LookAhead: {
// SAVE
// FORKJUMP _BODY
// POPSAVED
// LABEL _BODY
// REGEXP BODY
// RESTORE
empend((ByteCodeValueType)OpCodeId::Save);
empend((ByteCodeValueType)OpCodeId::ForkJump);
empend((ByteCodeValueType)1);
empend((ByteCodeValueType)OpCodeId::PopSaved);
extend(move(lookaround_body));
empend((ByteCodeValueType)OpCodeId::Restore);
return;
@ -613,6 +620,14 @@ public:
ByteString arguments_string() const override { return ByteString::empty(); }
};
class OpCode_PopSaved final : public OpCode {
public:
ExecutionResult execute(MatchInput const& input, MatchState& state) const override;
ALWAYS_INLINE OpCodeId opcode_id() const override { return OpCodeId::PopSaved; }
ALWAYS_INLINE size_t size() const override { return 1; }
ByteString arguments_string() const override { return ByteString::empty(); }
};
class OpCode_Save final : public OpCode {
public:
ExecutionResult execute(MatchInput const& input, MatchState& state) const override;

2
Tests/LibRegex/Regex.cpp
View file

@ -738,6 +738,8 @@ TEST_CASE(ECMA262_match)
// Optimizer bug, ignoring an enabled trailing 'invert' when comparing blocks, ladybird#3421.
{ "[^]*[^]"sv, "i"sv, true },
{ "xx|...|...."sv, "cd"sv, false },
// Tests nested lookahead with alternation - verifies proper save/restore stack cleanup
{ "a(?=.(?=c)|b)b"sv, "ab"sv, true },
};
for (auto& test : tests) {