Skip to content

Commit 9adc368

Browse files
schuayRadu Samson
authored andcommitted
deps: V8: backport b69a1a1d8613
Original commit message: [regexp] Record flags on deferred worklist items ActionNode::Emit for MODIFY_FLAGS was previously changed to restore outer_flags on the way out to avoid leaking inner flags to trailing deferred nodes. However, this caused nodes deferred from within the modifier group to be compiled with the outer flags when processed by Compiler::Assemble. Instead of restoring flags in ActionNode::Emit, record the active flags at the point where a node is deferred in Compiler::AddWork, and restore them from the work-list item before emitting it. This partially reverts https://chromium-review.googlesource.com/c/v8/v8/+/8174589. Change-Id: I3a552f9223b88ba99889e4375b8d1ea761257b94 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/8213283 Reviewed-by: Patrick Thier <[email protected]> Auto-Submit: Jakob Linke <[email protected]> Commit-Queue: Patrick Thier <[email protected]> Cr-Commit-Position: refs/heads/main@{#109102} Refs: v8/v8@b69a1a1 Co-authored-by: Radu Samson <[email protected]> Refs: nodejs#66277 PR-URL: nodejs#67207 Reviewed-by: Antoine du Hamel <[email protected]>
1 parent c54a21b commit 9adc368

4 files changed

Lines changed: 26 additions & 5 deletions

File tree

‎common.gypi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
# Reset this number to 0 on major V8 upgrades.
4646
# Increment by one for each non-official patch applied to deps/v8.
47-
'v8_embedder_string': '-node.45',
47+
'v8_embedder_string': '-node.46',
4848

4949
##### V8 defaults for Node.js #####
5050

‎deps/v8/src/regexp/regexp-compiler.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ RegExpCompiler::CompilationResult RegExpCompiler::Assemble(
346346
return CompilationResult::RegExpTooBig();
347347
};
348348

349-
ZoneVector<RegExpNode*> work_list(zone());
349+
ZoneVector<WorkItem> work_list(zone());
350350
work_list_ = &work_list;
351351
Label fail;
352352
macro_assembler_->PushBacktrack(&fail);
@@ -357,11 +357,13 @@ RegExpCompiler::CompilationResult RegExpCompiler::Assemble(
357357
macro_assembler_->BindJumpTarget(&fail);
358358
macro_assembler_->Fail();
359359
while (!work_list.empty()) {
360-
RegExpNode* node = work_list.back();
360+
WorkItem item = work_list.back();
361+
RegExpNode* node = item.node;
361362
TRACE_WITH_NODE(this, "Popping from worklist ", node);
362363
work_list.pop_back();
363364
node->set_on_work_list(false);
364365
if (!node->label()->is_bound()) {
366+
set_flags(item.flags);
365367
if (node->Emit(this, &new_trace).IsError()) {
366368
return ReportError();
367369
}

‎deps/v8/src/regexp/regexp-compiler.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,10 +570,15 @@ class RegExpCompiler {
570570
// lead surrogate and start matching from there.
571571
RegExpNode* OptionallyStepBackToLeadSurrogate(RegExpNode* on_success);
572572

573+
struct WorkItem {
574+
RegExpNode* node;
575+
RegExpFlags flags;
576+
};
577+
573578
inline void AddWork(RegExpNode* node) {
574579
if (!node->on_work_list() && !node->label()->is_bound()) {
575580
node->set_on_work_list(true);
576-
work_list_->push_back(node);
581+
work_list_->push_back({node, flags()});
577582
}
578583
}
579584

@@ -644,7 +649,7 @@ class RegExpCompiler {
644649
int next_register_;
645650
int unicode_lookaround_stack_register_;
646651
int unicode_lookaround_position_register_;
647-
ZoneVector<RegExpNode*>* work_list_;
652+
ZoneVector<WorkItem>* work_list_;
648653
int recursion_depth_;
649654
RegExpFlags flags_;
650655
RegExpMacroAssembler* macro_assembler_;

‎deps/v8/test/mjsunit/regexp-modifiers.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,17 @@ test(
7575
test(/(?i:.oo)/, ['Foo', 'FOO', 'fOo', 'foO']);
7676

7777
test(/(?i:foo)[x-z]/v, ['Foox', 'fOoz'], ['fooX','FooZ']);
78+
79+
// Nodes inside a modifier group deferred to the work list must be compiled with
80+
// the group's inner flags, not the outer flags.
81+
test(
82+
/^(?i:(?:a|b)(?:c|d)(?:e|f)(?:g|h)(?:i|j)(?:k|l)(?:m|n)X)/,
83+
['acegikmx', 'acegikmX', 'bdfhjlnx', 'bdfhjlnX'],
84+
['acegikmy', 'bdfhjlny']);
85+
86+
// Symmetrically, nodes inside a (?-i:...) group under outer /i must compile
87+
// case-sensitively even when deferred.
88+
test(
89+
/^(?-i:(?:a|b)(?:c|d)(?:e|f)(?:g|h)(?:i|j)(?:k|l)(?:m|n)x)/i,
90+
['acegikmx', 'bdfhjlnx'],
91+
['acegikmX', 'bdfhjlnX']);

0 commit comments

Comments
 (0)