From nobody Thu Jan 27 18:55:08 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 BB19D19814F0; Thu, 27 Jan 2022 18:55:09 +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 4Jl8sn1Rskz4SR4; Thu, 27 Jan 2022 18:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643309709; 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=ZTjlvSwWG2LscaZWWxMYCPl1jvWwc39kP6GN9aSMzsU=; b=R9UBSwWYXuD68p49q6eHzFhuBWU8JmRfgTcmQY0asce1xq1zCFgBcCoi0IC1KjA3U8g3tX R4UL04jLI6VZes9gkX/zseLME3VkwEUXJTaPkCt4ydty1bHaWhqDUAMz8Xx16cNvOcMpnk RcXTWAlYo3JVY/pYXv7mVgJQ6BKWQvkjNBve9qOmysncXp3Xl4KIyhdRLHE+hr5EUrVvNJ +uaJfxD6oDhZsqybkEuRdj+4hYEnuoEstuSTKfrqJv05vOUArgRju0lysl+JWWdga/QSvD xdu04NV7nNNM+O/pgrpcTTvwrti8HoAjEd1W56zpHDh5df26bUng5tuJdNhVcQ== 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 0C4391C267; Thu, 27 Jan 2022 18:55:09 +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 20RIt8gc002113; Thu, 27 Jan 2022 18:55:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RIt8Vn002112; Thu, 27 Jan 2022 18:55:08 GMT (envelope-from git) Date: Thu, 27 Jan 2022 18:55:08 GMT Message-Id: <202201271855.20RIt8Vn002112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b84693501af6 - main - 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b84693501af6521487327ec4eb7c6ae0097ac5d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643309709; 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=ZTjlvSwWG2LscaZWWxMYCPl1jvWwc39kP6GN9aSMzsU=; b=j51z7sq6YrzZU/jYQdWjfO6Hh1WF1f1V4jweU3HhNkKlphjypzeN26AWW4akSXnYKWfVDA CnSMFdQlzZ0hkJzRbDzlsYzbwiIjMIEyt5cG0cz9SNjeKbh2zJ767dKGA6vEnI5q25NW7B hmotoqeHBhI5L1gZMwUZvbfo/tjwOSK4LafnZcbKZTQtb8W2Az4pT407RoGoLj2mSdGmrN gt12hwJQiWJdwcBsYcd6voR1RtOBGe4Rb3U7Q8Ln0aSrXTYU7XlremNCcKfGAVGmnKKofs A7/5EfeJy3bIerv8FJZgChRo3SwYsbRm2k442kUl0A+IvcQOMrk6t5P+2jXuBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643309709; a=rsa-sha256; cv=none; b=osmNlY+Ln7LQoigCiJ23rTtUwp2v/grwuKPbPLU3MyX6xVw4ThuCCG7wC/7PfZpixCnpqK TG0Ie4bDBgGd+mQGSLcqGWAZExkE3itdE5WcYgoay7OUuPJjXLIhp93Txcp/mZCXM6367w J2j6KukPkZj4jhmJ4k6e6sOe+1JCk6y5vsJyo1nYva/fARUaoIYmQA3wO9ITWq5Z0a5qo3 e0spkojU7mP3LucK7kudJ7KNpHFKssBK3rRmZY8wM3QJFw2/hFSjdzbzbk6ikr72G8Asnm I2f1Uh4OO9KH+w+/FZ7k7GrqKAbybLZIZFIXclxgumtAnEzFzUo9fEGtHtMyXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b84693501af6521487327ec4eb7c6ae0097ac5d7 commit b84693501af6521487327ec4eb7c6ae0097ac5d7 Author: John Baldwin AuthorDate: 2022-01-27 18:34:35 +0000 Commit: John Baldwin CommitDate: 2022-01-27 18:34:35 +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 --- 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) {