No issue - Always use jemalloc allocator for storage memory when

MOZ_MEMORY is defined (which is defined by enabling jemalloc in config)

1 files changed, 1 insertions, 8 deletions

diff --git a/storage/moz.build b/storage/moz.build
index 216a1cf74..5ccfabd71 100644
--- a/storage/moz.build
+++ b/storage/moz.build
@@ -88,17 +88,10 @@ FINAL_LIBRARY = 'xul'
 # Don't use the jemalloc allocator on Android, because we can't guarantee
 # that Gecko will configure sqlite before it is first used (bug 730495).
 #
-# Don't use the jemalloc allocator when using system sqlite. Linked in libraries
-# (such as NSS) might trigger an initialization of sqlite and allocation
-# of memory using the default allocator, prior to the storage service
-# registering its allocator, causing memory management failures (bug 938730).
-# However, this is not an issue if both the jemalloc allocator and the default
-# allocator are the same thing.
-#
 # Note: On Windows our sqlite build assumes we use jemalloc.  If you disable
 # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
 # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
-if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_SYSTEM_SQLITE']:
+if CONFIG['MOZ_MEMORY']:
     if CONFIG['OS_TARGET'] != 'Android':
         DEFINES['MOZ_STORAGE_MEMORY'] = True