Skip to content

Commit

Permalink
Make garbage collector stats to work with gcc8
Browse files Browse the repository at this point in the history
  • Loading branch information
rainemak committed Nov 20, 2019
1 parent 203eca0 commit 44e2467
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
38 changes: 38 additions & 0 deletions rpm/0017-Make-gc-stats-work-with-gcc8.patch
@@ -0,0 +1,38 @@
From 42c6e549164091d719d55721e73ecbf1af415b8e Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 19 Nov 2019 21:24:17 +0200
Subject: [PATCH 17/17] Make gc stats work with gcc8

Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
js/src/gc/Statistics.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/src/gc/Statistics.cpp b/js/src/gc/Statistics.cpp
index ab8aae772a76..34df5babb2e6 100644
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -496,8 +496,8 @@ Statistics::formatDetailedDescription()
JS_snprintf(buffer, sizeof(buffer), format,
ExplainInvocationKind(gckind),
ExplainReason(slices[0].reason),
- nonincremental() ? "no - " : "yes",
- "",
+ nonincrementalReason_ ? "no - " : "yes",
+ nonincrementalReason_ ? nonincrementalReason_ : "",
zoneStats.collectedZoneCount, zoneStats.zoneCount, zoneStats.sweptZoneCount,
zoneStats.collectedCompartmentCount, zoneStats.compartmentCount,
zoneStats.sweptCompartmentCount,
@@ -530,7 +530,8 @@ Statistics::formatDetailedSliceDescription(unsigned i, const SliceData& slice)
memset(buffer, 0, sizeof(buffer));
JS_snprintf(buffer, sizeof(buffer), format, i,
ExplainReason(slice.reason),
- slice.resetReason ? "yes - " : "no", slice.resetReason ? slice.resetReason : "",
+ "",
+ "",
uint64_t(slice.endFaults - slice.startFaults),
t(slice.duration()), budgetDescription, t(slice.start - slices[0].start));
return make_string_copy(buffer);
--
2.23.0

2 changes: 2 additions & 0 deletions rpm/xulrunner-qt5.spec
Expand Up @@ -59,6 +59,7 @@ Patch13: 0013-Do-not-load-nsHelperAppDlg.js.-Fixes-JB-44322.patch
Patch14: 0014-Embedlite-doesn-t-have-prompter-implementation.patch
Patch15: 0015-xulrunner-Disable-SiteSpecificUserAgent.js-from-the-.patch
Patch16: 0016-nemo-embedlite-Cleanup-build-configuration.-Fixes-JB.patch
Patch17: 0017-Make-gc-stats-work-with-gcc8.patch

BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Network)
Expand Down Expand Up @@ -163,6 +164,7 @@ Tests and misc files for xulrunner.
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1

mkdir -p "%BUILD_DIR"
cp -rf "%BASE_CONFIG" "%BUILD_DIR"/mozconfig
Expand Down

0 comments on commit 44e2467

Please sign in to comment.