From eb864e519d068c6f12ec6f12461bcb05887b6ce6 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 14 Nov 2017 19:04:44 +0000 Subject: www/firefox: update to 57.0 (marketed as "Firefox Quantum") Not a MFH candidate due to POLA violation per redesigned UI, broken legacy addons and auto-reviewed new addons. Changes: https://www.mozilla.org/firefox/57.0/releasenotes/ PR: 222693 Tested by: pi, tobik, TrueOS --- www/firefox/files/patch-bug1401804 | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 www/firefox/files/patch-bug1401804 (limited to 'www/firefox/files/patch-bug1401804') diff --git a/www/firefox/files/patch-bug1401804 b/www/firefox/files/patch-bug1401804 deleted file mode 100644 index c3b4688dc744..000000000000 --- a/www/firefox/files/patch-bug1401804 +++ /dev/null @@ -1,31 +0,0 @@ -commit 38e6bb85066b -Author: Jon Coppeard -Date: Fri Sep 22 13:09:44 2017 +0100 - - Bug 1401804 - Fix IsMarkedBlack check used in gray marking asserts r=sfink a=sylvestre ---- - js/src/gc/Barrier.cpp | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git js/src/gc/Barrier.cpp js/src/gc/Barrier.cpp -index 5a5dfbe9bed0..0c42d16e7117 100644 ---- js/src/gc/Barrier.cpp -+++ js/src/gc/Barrier.cpp -@@ -33,15 +33,8 @@ RuntimeFromActiveCooperatingThreadIsHeapMajorCollecting(JS::shadow::Zone* shadow - bool - IsMarkedBlack(JSObject* obj) - { -- // Note: we assume conservatively that Nursery things will be live. -- if (!obj->isTenured()) -- return true; -- -- gc::TenuredCell& tenured = obj->asTenured(); -- if (tenured.isMarkedAny() || tenured.arena()->allocatedDuringIncremental) -- return true; -- -- return false; -+ return obj->isMarkedBlack() || -+ (obj->isTenured() && obj->asTenured().arena()->allocatedDuringIncremental); - } - - bool -- cgit v1.2.3