Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1705777 - Replace bufferIfNursery with tenured checks r=jandem

Browse Source 
This ends up doing the same thing but is easer to follow IMO.

Differential Revision: https://phabricator.services.mozilla.com/D112394
This commit is contained in:
Jon Coppeard 2021-04-19 08:44:46 +00:00
parent c34d1d2778
commit 3b8fa4cdc1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/vm/StringType.cpp
View File

@ -732,7 +732,6 @@ JSLinearString* JSRope::flattenInternal(JSRope* root) {
AutoCheckCannotGC nogc;
Nursery& nursery = root->runtimeFromMainThread()->gc.nursery();
gc::StoreBuffer* bufferIfNursery = root->storeBuffer();
/* Find the left most string, containing the first string. */
JSRope* leftmostRope = root;
@ -773,7 +772,7 @@ JSLinearString* JSRope::flattenInternal(JSRope* root) {
left.d.s.u3.base = (JSLinearString*)root; /* will be true on exit */
if (left.isTenured() && !root->isTenured()) {
// leftmost child -> root is a tenured -> nursery edge.
bufferIfNursery->putWholeCell(&left);
root->storeBuffer()->putWholeCell(&left);
}
pos = wholeChars + left_len;
@ -847,8 +846,8 @@ finish_node : {
// the nursery. Note that the root was a rope but will be an extensible
// string when we return, so it will not point to any strings and need
// not be barriered.
if (bufferIfNursery && str->isTenured()) {
bufferIfNursery->putWholeCell(str);
if (str->isTenured() && !root->isTenured()) {
root->storeBuffer()->putWholeCell(str);
}
str = parent;