From nobody Fri Jul 19 23:28:14 2024 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 4WQm7f43yfz5Qb1L; Fri, 19 Jul 2024 23:28:14 +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 4WQm7f3XKsz4chr; Fri, 19 Jul 2024 23:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721431694; 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=4pORcXUtcUOcwhI+tuL++ff4DWB5kXOs77Y4pVdS4PQ=; b=EWE0LYUrnXN369GSMCr5kD9s5MMctJiXqwxlwo2zIms882jgkWkptAwxNCewdfPsqQi0vV uV/djRCJAli1ceMN9JMKlDiJfuaOpZEDjmWQEc7XfCaCfl8I33UfLvcWahxtpig+Vsjm0R VJmD3l30W/QCT4tZeMvU5771AuvXZZi6uqjUcRw/376+4tl7vPGXbRWik6N53Gyoq6XIfa 2QH2wQnMenHY5BwkYs1cyPV++z3HiMQ7mNJMifnA/hDiLGzF4nWfdTGJrJNCzewEj/Dt8u ipITbtpl/SAEec2u3oDS05i8GZIkgn7st4id+3Viu+428qKlKN5VYxPQLF1Eqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721431694; a=rsa-sha256; cv=none; b=bhMGydi7BzgKvaKOvaEJBoakPRR6mDa1N/1HAINH57t98nEhXprV4qiJZrcHd3wy+M3GJ0 l6YDK4syVvH3XABuG8K2IcR9kCvStnuIQfrk8Xa7NNfzMDq0cgBhmKPssyCHIftC8bceTz H7LyltrvDxeZkQBHppTZlM0uXRk1wWmd7HZcg2igJ4rRrvDDECkxeGusvLMkVNODxPpg8U z5VHHCzSJ34GR9cUe8nFhrkAKi1Z+cFlidn9KtmJAXj4vdSc+pYBEGFCB0HsLkoM6x7bRY m14Px1WuP9i5nKR+9fpWioCavWayTnV6pxY2QuP1JNL5vwdlMWmVjggSG34JdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721431694; 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=4pORcXUtcUOcwhI+tuL++ff4DWB5kXOs77Y4pVdS4PQ=; b=p2FhYQHkf0auhxeg2THz3kSzW8GYEyBG/EqMg7oQUvroEnsV4HmRRtjAzDHxp239/LBkfn zBhwlOEQYyZWTMUr4RUDHPj9HSh9IFhhv0ovjJqvyk7kKQ48AzdO7Qe7qC63WCLck61C6d PDqNbrKlErYt7czDeVDhh/O2+7+vHxJdhvrQ9jHHC+0bjGRF7TG10VF2W3IbI1jpw9XjmM A18cYN9v+mrOQa/5DMFQ2WBqtubivyzwWmoP9pa/Ydeg4chdCRRSHF2GEP+HR0RLJvi4dc SVjJtPiyrL4ZxQZj3lNpf7Q6UuczUULJxBkbhknvM64S/ihEpVBl8grtvZ/jDA== 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 4WQm7f37fCzsSP; Fri, 19 Jul 2024 23:28:14 +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 46JNSEW4070915; Fri, 19 Jul 2024 23:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JNSExY070912; Fri, 19 Jul 2024 23:28:14 GMT (envelope-from git) Date: Fri, 19 Jul 2024 23:28:14 GMT Message-Id: <202407192328.46JNSExY070912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 47fb5d2b13c5 - main - kyua: fix gcc builds 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47fb5d2b13c5ca8e1a3b05ed223d62ea4b43b3e8 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=47fb5d2b13c5ca8e1a3b05ed223d62ea4b43b3e8 commit 47fb5d2b13c5ca8e1a3b05ed223d62ea4b43b3e8 Author: Brooks Davis AuthorDate: 2024-07-19 23:24:35 +0000 Commit: Brooks Davis CommitDate: 2024-07-19 23:28:06 +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 --- 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(); }