From owner-svn-src-head@freebsd.org  Wed Mar 22 21:45:43 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 86A92D181AB;
 Wed, 22 Mar 2017 21:45:43 +0000 (UTC) (envelope-from dim@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 564861811;
 Wed, 22 Mar 2017 21:45:43 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MLjgsI032038;
 Wed, 22 Mar 2017 21:45:42 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MLjgYG032037;
 Wed, 22 Mar 2017 21:45:42 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201703222145.v2MLjgYG032037@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 22 Mar 2017 21:45:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315745 - head/contrib/libcxxrt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Mar 2017 21:45:43 -0000

Author: dim
Date: Wed Mar 22 21:45:42 2017
New Revision: 315745
URL: https://svnweb.freebsd.org/changeset/base/315745

Log:
  Cherry-pick libcxxrt commit 8a853717e61d5d55cbdf74d9d0a7545da5d5ff92:
  
  Author: David Chisnall <theraven@FreeBSD.org>
  Date:   Wed Mar 22 12:27:08 2017 +0000
  
      Simplify some code.
  
      realloc() with a null pointer is equivalent to malloc, so we don't need
      to handle the two cases independently.
  
      Fixes #46
  
  This should help with lang/beignet and other programs, which expect
  __cxa_demangle(name, NULL, NULL, &status) to return zero in status.
  
  PR:		213732
  MFC after:	3 days

Modified:
  head/contrib/libcxxrt/typeinfo.cc

Modified: head/contrib/libcxxrt/typeinfo.cc
==============================================================================
--- head/contrib/libcxxrt/typeinfo.cc	Wed Mar 22 21:39:00 2017	(r315744)
+++ head/contrib/libcxxrt/typeinfo.cc	Wed Mar 22 21:45:42 2017	(r315745)
@@ -86,15 +86,7 @@ extern "C" char* __cxa_demangle(const ch
 	if (NULL != demangled)
 	{
 		size_t len = strlen(demangled);
-		if (buf == NULL)
-		{
-			if (n)
-			{
-				*n = len;
-			}
-			return demangled;
-		}
-		if (*n < len+1)
+		if (!buf || (*n < len+1))
 		{
 			buf = static_cast<char*>(realloc(buf, len+1));
 		}