From nobody Sun Feb 20 12:31:02 2022 X-Original-To: dev-commits-src-all@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 9D73419DAD7C; Sun, 20 Feb 2022 12:31:02 +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 4K1lCV3lX7z4p4B; Sun, 20 Feb 2022 12:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645360262; 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=ZopvPlZ1XbJRwlBcMIdzYJRiGd+ZWICAggFfRW2aZ0g=; b=lrEgyrTxa7zGIT35vvoykaqriccjz9LwjZ0WAoCFR90rTwDEe8GSyNxo/Cw65Lic66rzFS GC9te4rJnn9BylGkIYsQAh7frCgdtKMHhpNtkcfqAWLa2mph6eCntBGI8Kjfs8/XKFUD1t iENdnNqXOUCQGQ9JH0Mm7G3NSh8+K+GXbymdfKz/P6Ku1td0RX8DwVnmSa5XtAMa+WbrM/ 9+KwhLTnOXVuOebV1DzVjqg8hBdYbusQ3fL2TTh2wv/F9nFGSr/FitmC6ueG3DzfWtGOr7 4M7jsQAs1ZrPbdnFfHTGE5VjmUzs9XEMV6nH0/D0pN/QVhCqDSPfj1y2s9AJEw== 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 5DDB21C7B5; Sun, 20 Feb 2022 12:31:02 +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 21KCV2XH050792; Sun, 20 Feb 2022 12:31:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KCV2Wg050791; Sun, 20 Feb 2022 12:31:02 GMT (envelope-from git) Date: Sun, 20 Feb 2022 12:31:02 GMT Message-Id: <202202201231.21KCV2Wg050791@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: ad1668172107 - stable/13 - Use an unsigned 64-bit integer for exception class. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: ad16681721072f011e26f775ce47c872ec001f26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645360262; 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=ZopvPlZ1XbJRwlBcMIdzYJRiGd+ZWICAggFfRW2aZ0g=; b=K7HyETB+UwHSMoqQUm6ruPaDw64xqxQv0H/6BssWlihZnk6lJAmd0Wry35GA4+mMcAE11C EEMAX4pL4s7ceOiQy75kQM3DMJeJJt0BmdqibHJQUATadjPaTF+nV90CSUz+UFmfKrkObR QCSQJowjTFwwPWjVR0ZEpwruMuMchLB4h6rg1UIpX3leEQ8Mkp6yD0QqncBEOVFFMUsYE5 ufx5u4mXuGDRADYHHMFeEitDLdMVMHE/4URCH5S1nzd+t0loRWRnOgYBEKM8bbmuUj2mEa 4FqM8a1KmhkFKHPIL6Ez2sKh2BQSpetMDhno7ceRDlq3CLBmZTQuV+MTcrfS/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645360262; a=rsa-sha256; cv=none; b=S3ZxR0P/vTfyt7D4kVEdnIe14aaf6NOnz77Smk5zIfGOAES1QZVIi0xV5rB8HzI+rfbR24 VrqEAJ/kh5fNk9a+U1ZcbDjwglSsihi6Q9Qg0fm8zz+1zZ1JjGn4rdY1bVx4IuQXERCDOu iEZVRZSPFbjW/4VibADbg9/NQxcVGF+LNB2Hs8rCfvXOuZwh+v0eAlCaSaEc3AM7n6GwoB olshBn8PL/BO1Kdrrll0m0yRpTI2GMcC2vYsLD9dMw0vJsDuOskOGOAsJzZFN4Kel5s4tE CyIQwgjho9fLth0ELMNO6RMbyP97h57dQ6FurMiS+e8F/gYoCqOMw3zaxaqu3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ad16681721072f011e26f775ce47c872ec001f26 commit ad16681721072f011e26f775ce47c872ec001f26 Author: John Baldwin AuthorDate: 2022-01-27 18:34:35 +0000 Commit: Dimitry Andric CommitDate: 2022-02-20 12:28:58 +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) {