svn commit: r326742 - head/contrib/jemalloc/include/jemalloc/internal

[Michal Meloun]

Author: mmel
Date: Sun Dec 10 09:17:21 2017
New Revision: 326742
URL: https://svnweb.freebsd.org/changeset/base/326742

Log:
  Relax too restrictive assert.
  
  The problem has been reported to upstream and similar change will
  be included in next jemalloc release.
  
  Submitted by:	David Goldblatt <davidtgoldblatt at gmail.com>
  MFC after: 	2 weeks

Modified:
  head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h

Modified: head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h
==============================================================================
--- head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h	Sun Dec 10 09:15:37 2017	(r326741)
+++ head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h	Sun Dec 10 09:17:21 2017	(r326742)
@@ -91,7 +91,8 @@ idalloctm(tsdn_t *tsdn, void *ptr, tcache_t *tcache, a
 	if (config_stats && is_internal) {
 		arena_internal_sub(iaalloc(tsdn, ptr), isalloc(tsdn, ptr));
 	}
-	if (!is_internal && tsd_reentrancy_level_get(tsdn_tsd(tsdn)) != 0) {
+	if (!is_internal && !tsdn_null(tsdn) && 
+	    tsd_reentrancy_level_get(tsdn_tsd(tsdn)) != 0) {
 		assert(tcache == NULL);
 	}
 	arena_dalloc(tsdn, ptr, tcache, alloc_ctx, slow_path);