From owner-svn-src-projects@freebsd.org Mon Oct 5 17:47:24 2015 Return-Path: Delivered-To: svn-src-projects@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 3F42199A895 for ; Mon, 5 Oct 2015 17:47:24 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 3070DF6C; Mon, 5 Oct 2015 17:47:24 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t95HlOjF027871; Mon, 5 Oct 2015 17:47:24 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t95HlNrf027867; Mon, 5 Oct 2015 17:47:23 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201510051747.t95HlNrf027867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Mon, 5 Oct 2015 17:47:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r288830 - in projects/clang370-import: contrib/libcxxrt lib/libcxxrt X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2015 17:47:24 -0000 Author: dim Date: Mon Oct 5 17:47:23 2015 New Revision: 288830 URL: https://svnweb.freebsd.org/changeset/base/288830 Log: Add std::uncaught_exceptions() to libcxxrt (C++17, see N4152 and N4259). This has also been submitted upstream. Modified: projects/clang370-import/contrib/libcxxrt/exception.cc projects/clang370-import/lib/libcxxrt/Version.map Modified: projects/clang370-import/contrib/libcxxrt/exception.cc ============================================================================== --- projects/clang370-import/contrib/libcxxrt/exception.cc Mon Oct 5 17:45:13 2015 (r288829) +++ projects/clang370-import/contrib/libcxxrt/exception.cc Mon Oct 5 17:47:23 2015 (r288830) @@ -1474,6 +1474,15 @@ namespace std return info->globals.uncaughtExceptions != 0; } /** + * Returns the number of exceptions currently being thrown that have not + * been caught. This can occur inside a nested catch statement. + */ + int uncaught_exceptions() throw() + { + __cxa_thread_info *info = thread_info(); + return info->globals.uncaughtExceptions; + } + /** * Returns the current unexpected handler. */ unexpected_handler get_unexpected() throw() Modified: projects/clang370-import/lib/libcxxrt/Version.map ============================================================================== --- projects/clang370-import/lib/libcxxrt/Version.map Mon Oct 5 17:45:13 2015 (r288829) +++ projects/clang370-import/lib/libcxxrt/Version.map Mon Oct 5 17:47:23 2015 (r288830) @@ -356,3 +356,9 @@ GLIBCXX_3.4.9 { }; } GLIBCXX_3.4; +GLIBCXX_3.4.22 { + extern "C++" { + "std::uncaught_exceptions()"; + }; +} GLIBCXX_3.4.9; +