wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1205348 - Always do shutdown CCs when NS_FREE_PERMANENT_DATA is defined. r=smaug

Browse Source
This commit is contained in:
Andrew McCreight 2015-09-16 10:10:00 +02:00
parent 2ec6e0b20f
commit 480f5bda5e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/mozbase/mozrunner/mozrunner/utils.py
View File

@ -215,8 +215,6 @@ def test_environment(xrePath, env=None, crashreporter=True, debugger=False,
log.info("WARNING | runtests.py | LSan suppressions file"
" does not exist! " + suppressionsFile)
env["LSAN_OPTIONS"] = ':'.join(lsanOptions)
# Run shutdown GCs and CCs to avoid spurious leaks.
env['MOZ_CC_RUN_DURING_SHUTDOWN'] = '1'
if len(asanOptions):
env['ASAN_OPTIONS'] = ':'.join(asanOptions)

2
xpcom/base/nsCycleCollector.cpp
View File

@ -3829,7 +3829,7 @@ nsCycleCollector::Shutdown()
// Always delete snow white objects.
FreeSnowWhite(true);
#ifndef DEBUG
#ifndef NS_FREE_PERMANENT_DATA
if (PR_GetEnv("MOZ_CC_RUN_DURING_SHUTDOWN"))
#endif
{