Skip to content

update regex#28269

Closed
jdm wants to merge 4 commits intoservo:masterfrom
jdm:dependabot/cargo/regex-1.4.4
Closed

update regex#28269
jdm wants to merge 4 commits intoservo:masterfrom
jdm:dependabot/cargo/regex-1.4.4

Conversation

@jdm
Copy link
Member

@jdm jdm commented Mar 12, 2021

No description provided.

@jdm
Copy link
Member Author

jdm commented Mar 12, 2021

@bors-servo try=windows

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 12, 2021
@jdm
Copy link
Member Author

jdm commented Mar 12, 2021

@bors-servo try=windows

@bors-servo
Copy link
Contributor

⌛ Trying commit 43807a3 with merge cf29de2...

bors-servo added a commit that referenced this pull request Mar 12, 2021
@bors-servo
Copy link
Contributor

☀️ Test successful - status-taskcluster
State: approved= try=True

@jdm
Copy link
Member Author

jdm commented Mar 12, 2021

@bors-servo try=windows

@bors-servo
Copy link
Contributor

⌛ Trying commit 2001b14 with merge 6a6cd4f...

bors-servo added a commit that referenced this pull request Mar 12, 2021
@bors-servo
Copy link
Contributor

💔 Test failed - status-taskcluster

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Mar 12, 2021
@jdm
Copy link
Member Author

jdm commented Mar 12, 2021

Verified that rust-lang/regex@e040c1b is the commit that triggers the regression.

@jdm
Copy link
Member Author

jdm commented Mar 12, 2021

I have not been able to reproduce the issue in mozjs or rust-mozjs, strangely (servo/rust-mozjs#537 and servo/mozjs#274)

BurntSushi added a commit to rust-lang/regex that referenced this pull request Mar 14, 2021
This commit fixes a fairly large regression in the stack size of a Regex
introduced in regex 1.4.4. When I dropped thread_local and replaced it
with Pool, it turned out that Pool inlined a T into its struct and a
Regex in turn had Pool inlined into itself. It further turns out that
the T=ProgramCache is itself quite large.

We fix this by introducing an indirection in the inner regex type. That
is, we use a Box<Pool> instead of a Pool. This shrinks the size of a
Regex from 856 bytes to 16 bytes.

Interestingly, prior to regex 1.4.4, a Regex was still quite substantial
in size, coming in at around 552 bytes. So it looks like the 1.4.4
release didn't dramatically increase it, but it increased it enough that
folks started experiencing real problems: stack overflows.

Fixes #750, Fixes #751

Ref servo/servo#28269
BurntSushi added a commit to rust-lang/regex that referenced this pull request Mar 14, 2021
This commit fixes a fairly large regression in the stack size of a Regex
introduced in regex 1.4.4. When I dropped thread_local and replaced it
with Pool, it turned out that Pool inlined a T into its struct and a
Regex in turn had Pool inlined into itself. It further turns out that
the T=ProgramCache is itself quite large.

We fix this by introducing an indirection in the inner regex type. That
is, we use a Box<Pool> instead of a Pool. This shrinks the size of a
Regex from 856 bytes to 16 bytes.

Interestingly, prior to regex 1.4.4, a Regex was still quite substantial
in size, coming in at around 552 bytes. So it looks like the 1.4.4
release didn't dramatically increase it, but it increased it enough that
folks started experiencing real problems: stack overflows.

Since indirection can lead to worse locality and performance loss, I did
run the benchmark suite. I couldn't see any measurable difference. This
is generally what I would expect. This is an indirection at a fairly
high level. There's lots of other indirection already, and this
indirection isn't accessed in a hot path. (The regex cache itself is of
course used in hot paths, but by the time we get there, we have already
followed this particular pointer.)

We also include a regression test that asserts a Regex (and company) are
16 bytes in size. While this isn't an API guarantee, it at least means
that increasing the size of Regex will be an intentional thing in the
future and not an accidental leakage of implementation details.

Fixes #750, Fixes #751

Ref servo/servo#28269
BurntSushi added a commit to rust-lang/regex that referenced this pull request Mar 14, 2021
This commit fixes a fairly large regression in the stack size of a Regex
introduced in regex 1.4.4. When I dropped thread_local and replaced it
with Pool, it turned out that Pool inlined a T into its struct and a
Regex in turn had Pool inlined into itself. It further turns out that
the T=ProgramCache is itself quite large.

We fix this by introducing an indirection in the inner regex type. That
is, we use a Box<Pool> instead of a Pool. This shrinks the size of a
Regex from 856 bytes to 16 bytes.

Interestingly, prior to regex 1.4.4, a Regex was still quite substantial
in size, coming in at around 552 bytes. So it looks like the 1.4.4
release didn't dramatically increase it, but it increased it enough that
folks started experiencing real problems: stack overflows.

Since indirection can lead to worse locality and performance loss, I did
run the benchmark suite. I couldn't see any measurable difference. This
is generally what I would expect. This is an indirection at a fairly
high level. There's lots of other indirection already, and this
indirection isn't accessed in a hot path. (The regex cache itself is of
course used in hot paths, but by the time we get there, we have already
followed this particular pointer.)

We also include a regression test that asserts a Regex (and company) are
16 bytes in size. While this isn't an API guarantee, it at least means
that increasing the size of Regex will be an intentional thing in the
future and not an accidental leakage of implementation details.

Fixes #750, Fixes #751

Ref servo/servo#28269
@BurntSushi
Copy link

This should be fixed by regex 1.4.5.

@jdm jdm closed this Mar 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-awaiting-review There is new code that needs to be reviewed. S-tests-failed The changes caused existing tests to fail.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants