From nobody Sun Feb 20 17:03:41 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 46EF819E9523; Sun, 20 Feb 2022 17:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K1sG51X5bz3sV0; Sun, 20 Feb 2022 17:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645376621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ehxWAAXKwqczO+lS5Z50My1vCimUEacM2pTu6TKCOxw=; b=BhSo9o6FP8XoPpsqfP406E0uE05OrLKWHT6kTqVhs0cdbtc7w4ZpvRIHnnUU8bR5mNrnnd qvKeKhGsPJ6tRR3aF0r+AZhMtDXLbt02BEbX1jibQCaM1aNNkbrrGUh6HqYReWHJ9NkxkA dPJW8kAUDVcvJ2nCCGObB+DniAgfnBisDZNGDEq/is2+rVXSM6WXuV5Y2VbsPNoK/t1rpa gh+If7B7/DKWIoOtKBqSlo37EvxZ7thsS5fbP+WJucsmoqCpSjFPs5APDGW4QmvLcL3sKD 1iXO/FzDhYvJHj8uhpRkQfSjWK82vnTciWWgpTj7UYZ6/V0Ed9E28mx5vJedAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 146AD20590; Sun, 20 Feb 2022 17:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21KH3f4P026993; Sun, 20 Feb 2022 17:03:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KH3f3J026992; Sun, 20 Feb 2022 17:03:41 GMT (envelope-from git) Date: Sun, 20 Feb 2022 17:03:41 GMT Message-Id: <202202201703.21KH3f3J026992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e9d6017dea4a - stable/12 - Use an unsigned 64-bit integer for exception class. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e9d6017dea4a92ae54e993bf85edaebf25b6b230 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645376621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ehxWAAXKwqczO+lS5Z50My1vCimUEacM2pTu6TKCOxw=; b=h0wZVSDP6J95ynO8n/diZW5r2V2AURifZWwplhUcdbMsTZpyTSJOjyrIK9iqqFapcDN0t/ K2A7VjOkc7NXksqJ1uHvhohDhTjUD8cjRWd8TFsD4TcZcq4kbywtmoxWtofQp4ZfkoEuwq tNS08SMsMcbTmlY16Y2YZT2g54ZO8oIpdm7n0dzjjXIJA6nBxVJpCLhuvg+hqE5OytDXDw 3J54cVe95aPs/AR4ndflTwXFe0ab6vav7c9O3bwbIelj1vh2ktaR7SHOrycLdfRdWnqt3b b34NMKIoXQmaklsUqMeeLaa1RQNzoTKJPUTk7+HhE56Zp+HVS5vF90im1X8Uvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645376621; a=rsa-sha256; cv=none; b=vHDielrelGR/wV6HR27D4A3QJqLKASVHzUyV2Rt0GBJgfGiRD/AjXnd+lAOJzwKYE7axfC W+MYMBogmmTv7pzAz81dgH/Nt4R6cDKLyqqnn4mS8MOVDT1BqKEbFlQxV+qTLG4ckKO0Lz 9yXOHLcJI2HKSYUFMYD3lQ1zwkoF2wQkt3zn7uBesWLdw9eMwdd+kqxBbiBdDf/F2JTzJ3 aAhODNNyebbsAXuGS8mLhfMVNCJQ0i7F6/TZ+ABg07mCKTsALCDPCVerup2+whe4AUltJ8 Fqy/kOp0/JbBhaxhCx4bi73an7ilGSYySJZ2XWy/L4lNE7RSIDugMnfIHets6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e9d6017dea4a92ae54e993bf85edaebf25b6b230 commit e9d6017dea4a92ae54e993bf85edaebf25b6b230 Author: John Baldwin AuthorDate: 2022-01-27 18:34:35 +0000 Commit: Dimitry Andric CommitDate: 2022-02-20 12:33:41 +0000 Use an unsigned 64-bit integer for exception class. This matches the type in other unwind headers (LLVM libunwind, libcxxrt, glibc). NB: include/unwind.h is not installed but is only used by libthr Reviewed by: imp, dim, emaste Differential Revision: https://reviews.freebsd.org/D34049 (cherry picked from commit b84693501af6521487327ec4eb7c6ae0097ac5d7) --- include/unwind.h | 4 ++-- lib/libthr/thread/thr_exit.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/unwind.h b/include/unwind.h index 5a07fd819f50..214fb43730aa 100644 --- a/include/unwind.h +++ b/include/unwind.h @@ -70,7 +70,7 @@ typedef void (*_Unwind_Exception_Cleanup_Fn) (_Unwind_Reason_Code, struct _Unwind_Exception *); typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn) (int, _Unwind_Action, - __int64_t, + __uint64_t, struct _Unwind_Exception *, struct _Unwind_Context *, void *); @@ -82,7 +82,7 @@ typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn) (int, _Unwind_Action, IA-64, while being more general. */ struct _Unwind_Exception { - __int64_t exception_class; + __uint64_t exception_class; _Unwind_Exception_Cleanup_Fn exception_cleanup; unsigned long private_1; unsigned long private_2; diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c index 78497c4a206a..c1244962f192 100644 --- a/lib/libthr/thread/thr_exit.c +++ b/lib/libthr/thread/thr_exit.c @@ -61,7 +61,7 @@ static void thread_unwind(void) __dead2; static void thread_uw_init(void); static _Unwind_Reason_Code thread_unwind_stop(int version, _Unwind_Action actions, - int64_t exc_class, + uint64_t exc_class, struct _Unwind_Exception *exc_obj, struct _Unwind_Context *context, void *stop_parameter); /* unwind library pointers */ @@ -133,7 +133,7 @@ thread_unwind_cleanup(_Unwind_Reason_Code code __unused, static _Unwind_Reason_Code thread_unwind_stop(int version __unused, _Unwind_Action actions, - int64_t exc_class __unused, + uint64_t exc_class __unused, struct _Unwind_Exception *exc_obj __unused, struct _Unwind_Context *context, void *stop_parameter __unused) {