From nobody Thu Oct 17 13:49:49 2024 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 4XTq2k0hWrz5Z2DD; Thu, 17 Oct 2024 13:49:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTq2k04s2z4lNG; Thu, 17 Oct 2024 13:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729172990; 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=BK6w8wVTDwqEPgKASBI7Bs0HRcbn3ygbzVx/WQUHujo=; b=sHwk1Gvx0IAAeyZaHlXWzZvscDc/OWprrs03aejaY2DMAPou3+amz4mJMu91X2rmYpKDRp /YdAnG8FFeggfO9mxXhZWRWjjxHZie4FvoyuT5koVjLJDhmfKKwcwMuJExPYDaKZByzRw7 0TSqRxRsq/nUQryH1hwVLszyZ7v7SfBzxth5+7upqUJ+I1gvax2TBvwDYftjJX8NILU2o0 mRSGTKGDn98N1HyGrAQbw5PaxZWwdskgxtAvHSqkSHjmd9OieeFeZxx0I0tLf2aEm/7Gqb d6wSAE4XDHNciqirf3qqhgCI5RyBpP5qDbqEA16GPRVJZzEd2//qTci//6eQVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729172990; 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=BK6w8wVTDwqEPgKASBI7Bs0HRcbn3ygbzVx/WQUHujo=; b=wFLCB+d4AG/p0/FdfpQi21WH6ih9IKNoIa38p/pR0BA1LR/LEUBVTvgZXA1iMPnUma1mfa KiwXZMBt/vofFdeJ3F6P1x07WuvfrpZDcjMgzWFI4F+0LaFkzYJEiSwagnG3MOV1+VFN9d APzxGp5O4uPVfXrUjZDwM0bJZNv3E5SfRwAIMVhjfVoSPJ2prwxF46TgNoq6BrLO0lHb6K g7dBaWBT2DxR0sumezaSK1K6QwZcccu3lGAGXYJlqFV1TvsGOUZgrprRNIKTbDR54QLzrU +TUuphjrkvYOXBDJkiHL6D6qsTrOlkp5pK7yz4sbqs77nJWNfecrpO2JjTFSjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729172990; a=rsa-sha256; cv=none; b=B7uVWyn2D4WzT9fHtovkTR8ntDKQFF7ZWylQIh3p7l8iA917SMGyXX6geF+bO1kXuCOkM5 eEYYARw3/jmio5i3Oy5nLXlBV4yagFfV6wx7fPx+BARG6YJXYhzJwfQvUzCqT0m1Y/E9CD sJl+Qx04scfYN44+qf4UsAMIX59sPq6288oWrJROvknb1A4a9+jfXf3jCF8FULWo7absuP QIUb4EPejEJrFSaPD8GbWm88wvylAEpxa93YCjzuoPboV8BTaHq3ywZxSsDFvX+iwgLsBA 78zBpzwXycPjhdCCVdD5YLXNSZS91DpQSffTqeLiJlzbQrS1wgZjLAqRYn9tZg== 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 4XTq2j6mHyzsJg; Thu, 17 Oct 2024 13:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49HDnnOd044649; Thu, 17 Oct 2024 13:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49HDnnvK044646; Thu, 17 Oct 2024 13:49:49 GMT (envelope-from git) Date: Thu, 17 Oct 2024 13:49:49 GMT Message-Id: <202410171349.49HDnnvK044646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Igor Ostapenko Subject: git: 946d76fb154b - stable/14 - kyua: fix gcc builds 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: igoro X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 946d76fb154bde23115ec4463d7968ee803769c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by igoro: URL: https://cgit.FreeBSD.org/src/commit/?id=946d76fb154bde23115ec4463d7968ee803769c8 commit 946d76fb154bde23115ec4463d7968ee803769c8 Author: Brooks Davis AuthorDate: 2024-07-19 23:24:35 +0000 Commit: Igor Ostapenko CommitDate: 2024-10-17 13:45:15 +0000 kyua: fix gcc builds For some reason execenv::exec() isn't successfully marked noreturn (rlibby reports that virtual functions can't be noreturn), but calling methods are so gcc rightly complains. Work around this by adding explicit __builtin_unreachable() calls. Reviewed by: imp, markj Fixes: 257e70f1d5ee kyua: Add FreeBSD Jail execution environment support Differential Revision: https://reviews.freebsd.org/D46041 (cherry picked from commit 47fb5d2b13c5ca8e1a3b05ed223d62ea4b43b3e8) Approved by: kp (mentor), markj (mentor) --- contrib/kyua/engine/atf.cpp | 2 ++ contrib/kyua/engine/plain.cpp | 1 + contrib/kyua/engine/tap.cpp | 1 + 3 files changed, 4 insertions(+) diff --git a/contrib/kyua/engine/atf.cpp b/contrib/kyua/engine/atf.cpp index f6746dd2f29f..47f3bd2a1903 100644 --- a/contrib/kyua/engine/atf.cpp +++ b/contrib/kyua/engine/atf.cpp @@ -196,6 +196,7 @@ engine::atf_interface::exec_test(const model::test_program& test_program, auto e = execenv::get(test_program, test_case_name); e->init(); e->exec(args); + __builtin_unreachable(); } @@ -227,6 +228,7 @@ engine::atf_interface::exec_cleanup( auto e = execenv::get(test_program, test_case_name); e->exec(args); + __builtin_unreachable(); } diff --git a/contrib/kyua/engine/plain.cpp b/contrib/kyua/engine/plain.cpp index 9a2c63f8b663..0aba9b3fb6fa 100644 --- a/contrib/kyua/engine/plain.cpp +++ b/contrib/kyua/engine/plain.cpp @@ -110,6 +110,7 @@ engine::plain_interface::exec_test( auto e = execenv::get(test_program, test_case_name); e->init(); e->exec(args); + __builtin_unreachable(); } diff --git a/contrib/kyua/engine/tap.cpp b/contrib/kyua/engine/tap.cpp index ed35ba40433f..716212d18d02 100644 --- a/contrib/kyua/engine/tap.cpp +++ b/contrib/kyua/engine/tap.cpp @@ -157,6 +157,7 @@ engine::tap_interface::exec_test( auto e = execenv::get(test_program, test_case_name); e->init(); e->exec(args); + __builtin_unreachable(); }