From owner-svn-src-all@freebsd.org  Sun Dec 10 09:17:22 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAAD7E87256;
 Sun, 10 Dec 2017 09:17:22 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B6C9469E91;
 Sun, 10 Dec 2017 09:17:22 +0000 (UTC)
 (envelope-from mmel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBA9HLdL035514;
 Sun, 10 Dec 2017 09:17:21 GMT (envelope-from mmel@FreeBSD.org)
Received: (from mmel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBA9HLPl035513;
 Sun, 10 Dec 2017 09:17:21 GMT (envelope-from mmel@FreeBSD.org)
Message-Id: <201712100917.vBA9HLPl035513@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmel set sender to
 mmel@FreeBSD.org using -f
From: Michal Meloun <mmel@FreeBSD.org>
Date: Sun, 10 Dec 2017 09:17:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326742 - head/contrib/jemalloc/include/jemalloc/internal
X-SVN-Group: head
X-SVN-Commit-Author: mmel
X-SVN-Commit-Paths: head/contrib/jemalloc/include/jemalloc/internal
X-SVN-Commit-Revision: 326742
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Dec 2017 09:17:23 -0000

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@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);