From nobody Tue Apr 29 15:33:16 2025 X-Original-To: dev-commits-src-main@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 4Zn48X24bJz5vBRc; Tue, 29 Apr 2025 15:33:16 +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 4Zn48X1bDnz3r62; Tue, 29 Apr 2025 15:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745940796; 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=h3cWCWYMChmseTveYIr8P1lKR9Jb4wSiHdTKZt9YzcM=; b=JKYAOW0ygq4S57rtM//kwhyTeeOVwD/dTXMD/6aabYJDjZ19bpbY8hh08SiEmA8+6NA1Bz 3vKMKYl3ajS8Imftxxvm+O8il6m0aSizNRCyioE2wLDy4VOEuJbTBk2X1QDGrTFZPSe02f U86vKNzCxllIJoPp5bU6WpHCf+yjIIycTs8amYLN3hOdK8nXZRmL2Hfha3LaJibOV9nEz6 cM77IVcY2uInqG/naSBQS2cihd0GnJvZmaipcoQAR79O9tOh7ppKzTw/dIKeQfl1BNcEUT lTdnaPFhs2i1ZevM4ma6tkFgTGoanOEfFLQI5OcoBHVGv4zgQFvJxpbY8wK2JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745940796; a=rsa-sha256; cv=none; b=OgnwO8A2WrtOtW5PRC59zyJZF6sBNE/k80dV1enHFLDX/Dt6XQi/PTEfer8Ewrt/p2Kwh0 BmANx0w+OxDkd/Yo9ZNVCwRyPaXC9KeoCkSyGRX3eEt3HAelBWo63rTAD8o02P3uGNc9aO PAHYzOhaGGG4fXqqVCvAq2bTP4wtbz/6C5nMBxVsqX0Sr32tdUmnE/TajUj3bhY1uA/ipQ DPJAXNztAr8O7pOuBbgdW7IZjXTfLWHSWSuhny6foBROWjvNxBzAWbPk1mhwTGA1m3NGAn LBLOw62VKfFyU/ucZh4skOZLaErVBKYZiF+qK+XGJ9Z8CZ/jcZs2ZaCcPmO+hA== 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=1745940796; 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=h3cWCWYMChmseTveYIr8P1lKR9Jb4wSiHdTKZt9YzcM=; b=LQwehxnKkfw8iECHA3NHbUWOlEyJtB6/njrKqucys8rNhMJnyva3Vj/yP372+D7Rzcrl4Y ahR6oHBwiFnbKHHtHphinNYO2mVbHKmRbi8o4XhS0Q3IP/ZwHEonCKxZuV8EqatuJgRB3F lNbTZYW1uRZzw4YKY5ZRVOSDh2AHgOVRyT4ZZriFUFosc9enoKCakABlQvloVCLH24tgc2 fbfFQo13bX5sdgLiRPlupoud8AnBk7tJRqneydLGwrxuUFcTgkg2+zBu7oRTJS8oovW8ha T81toz6/BDTRy0rOZd65FTn90ILLiH3rSCrb+z6yIVg7FaxiJzOOnNemB3YZpg== 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 4Zn48X0xY4zB54; Tue, 29 Apr 2025 15:33:16 +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 53TFXGhI091486; Tue, 29 Apr 2025 15:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TFXGu6091482; Tue, 29 Apr 2025 15:33:16 GMT (envelope-from git) Date: Tue, 29 Apr 2025 15:33:16 GMT Message-Id: <202504291533.53TFXGu6091482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 54a2c5978f51 - main - fts: Fix GCC compile error List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54a2c5978f512654df6954ce571ce06e445c7aec Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=54a2c5978f512654df6954ce571ce06e445c7aec commit 54a2c5978f512654df6954ce571ce06e445c7aec Author: Olivier Certner AuthorDate: 2025-04-29 11:19:58 +0000 Commit: Olivier Certner CommitDate: 2025-04-29 15:32:00 +0000 fts: Fix GCC compile error GCC does not support the blocks extension, contrary to clang with which it is automatically enabled by our infrastructure (see 'lib/libc/gen/Makefile.inc') when compiling 'fts.c'. The alternate code (blocks extension not supported/enabled) tried to dereference a 'void *' pointer (field 'fts_compar_b' of 'FTS') to access field 'isa' of the block mocked by 'block_abi.h'. Fix this by casting the pointer to the block type. Reviewed by: jhb, des Fixes: f0ac5e919f3f ("fts: Add blocks support.") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50068 --- lib/libc/gen/fts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index 1b5c38ed58bb..d440bc24eeca 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -352,7 +352,8 @@ fts_close(FTS *sp) #ifdef __BLOCKS__ Block_release(sp->fts_compar_b); #else - if (sp->fts_compar_b->isa != &_NSConcreteGlobalBlock) + if (((fts_block)(sp->fts_compar_b))->isa != + &_NSConcreteGlobalBlock) _Block_release(sp->fts_compar_b); #endif /* __BLOCKS__ */ }