diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
| commit | 2d4ff8df91414b42974c72b2870f5c6e9ad397a8 (patch) | |
| tree | 15b23dc6494a147e723cfdb3765be1568cf6c113 /xpcom/build/XPCOMInit.cpp | |
| parent | f4b8be889cb7ee31a62af5660f36aaa192599009 (diff) | |
| parent | 14eb8dc7bee8670e39d1199591d335579601f2ad (diff) | |
| download | UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.gz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.lz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.xz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'xpcom/build/XPCOMInit.cpp')
| -rw-r--r-- | xpcom/build/XPCOMInit.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index 7b220558f..e8ee5828a 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -1037,20 +1037,6 @@ ShutdownXPCOM(nsIServiceManager* aServMgr) NS_WARNING("Component Manager was never created ..."); } -#ifdef MOZ_ENABLE_PROFILER_SPS - // In optimized builds we don't do shutdown collections by default, so - // uncollected (garbage) objects may keep the nsXPConnect singleton alive, - // and its XPCJSContext along with it. However, we still destroy various - // bits of state in JS_ShutDown(), so we need to make sure the profiler - // can't access them when it shuts down. This call nulls out the - // JS pseudo-stack's internal reference to the main thread JSContext, - // duplicating the call in XPCJSContext::~XPCJSContext() in case that - // never fired. - if (PseudoStack* stack = mozilla_get_pseudo_stack()) { - stack->sampleContext(nullptr); - } -#endif - if (sInitializedJS) { // Shut down the JS engine. JS_ShutDown(); |