From nobody Thu Aug 20 20:45:05 2026 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 4hQwRj6f3Gz6pV5n for ; Thu, 20 Aug 2026 20:45:05 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hQwRj50P2z3YC2 for ; Thu, 20 Aug 2026 20:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787258705; 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=772K0DtowM8G+lsVpX9MJNSI1Wgq518FvetLDa6/yHo=; b=nWCcKkX1rhgOvltuWc0vnHD22KAKrag01nfL/+7J8mnmn3Y6vcWfKTpr47UVQTJvn0CoAH uX6863HFej8qktUDjhXJiy8nvekAiGEKrCsYjxuBVMfhqzkddS1gpMVs4z3E9kFDXGSH2v kBWUcZoC+Ecj6URlBBqb1cv0FkByts2kznj8STjjr6gP6b5oc4cbCL8zLs9TgeVq6fwDyJ UtlmIGnjcK2uvwHVLOeJTk649Mh7YG9DCEdJ38Sz8U4V8XROgiCuDg4uO/1ujDbjqdprEJ CADGxisRTD/er/SM2bRtv/GYaGpyqkZiX7R8jYFdH6UcfvG2N+c3/Yz4hoKHxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787258705; a=rsa-sha256; cv=none; b=FwM3piFiGygMDn+6eb+DJ3fY/hyMjxAtiGeA7/CpCiX8gKf6+ER8eg45JDnEFCWJ7Inu1E BW9jrrBvgQGc2TbruFXxBBWBS+kkipBbxIptl2F03GOrZnecR5JlVX1/5V/QuUvXvbC2JO 4f/9B/kZ41auCbsyj9U+2t7jQWVX7vECJnwwgqRwyWvOnh+fumw+lKtQIWniaiehGV0FQ/ mUQWHJi+t3MR1NA/UMOQ6UtzxAfXMfRl3kUCUHZSDkmKtz++CI7s+Wt7DABWcnfTgYSTGt DKiOa8wCbxc6eiKIjOyNlQvWP4/ZXiovzflce/VxmkZHTNGTeheFxVtcU/pLVQ== 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=1787258705; 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=772K0DtowM8G+lsVpX9MJNSI1Wgq518FvetLDa6/yHo=; b=MC0u7X9V9tZtQGgW2lqM5FblN06WDCZscQ1m9Ipy6yVUDUAF+/FwX/Cyz5uys9jKNH2EX4 /Lp9CzwcXxkjm81gP5pZ14SfguaLHjh1++g1zCXnHeGofWEAc3bYAmOKORZR2GHHw8V21N B6bkl+IUyTpW5msqXqNmt4EZHaw42BRjP51Kkfaw8Evoca+o8w0jWqaePCIeI2UcqPQJrX 7tbRUElUFdPu+MLwiWl5lW++LUsrOdtNie187l3HBg4mZ9BqNf5SezFAgixGtlABDOV8Lp Ol53aWB5fzh/40exIrzDR1iYaDZbm26KD6W4wRryJu2iWhGi1Tlwum9EIKTpng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hQwRj311kzZ56 for ; Thu, 20 Aug 2026 20:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a48 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Aug 2026 20:45:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 78bbe9fc3e35 - main - pmc: Use distinct names for arguments to the pmc_config constructor 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 78bbe9fc3e3529731df07e29464f103f96f6ebed Auto-Submitted: auto-generated Date: Thu, 20 Aug 2026 20:45:05 +0000 Message-Id: <6a876751.30a48.559158c9@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=78bbe9fc3e3529731df07e29464f103f96f6ebed commit 78bbe9fc3e3529731df07e29464f103f96f6ebed Author: John Baldwin AuthorDate: 2026-08-20 19:49:36 +0000 Commit: John Baldwin CommitDate: 2026-08-20 19:49:36 +0000 pmc: Use distinct names for arguments to the pmc_config constructor This pacifies shadow warnings from GCC: usr.sbin/pmc/cmd_pmc_record.cc: In constructor 'pmc_config::pmc_config(const std::__1::string&, uint64_t, cpuset_t)': usr.sbin/pmc/cmd_pmc_record.cc:96:71: error: declaration of 'cpumask' shadows a member of 'pmc_config' [-Werror=shadow] 96 | pmc_config(const std::string &event, uint64_t count, cpuset_t cpumask) | ~~~~~~~~~^~~~~~~ usr.sbin/pmc/cmd_pmc_record.cc:90:25: note: shadowed declaration is here 90 | cpuset_t cpumask; | ^~~~~~~ usr.sbin/pmc/cmd_pmc_record.cc:96:55: error: declaration of 'count' shadows a member of 'pmc_config' [-Werror=shadow] 96 | pmc_config(const std::string &event, uint64_t count, cpuset_t cpumask) | ~~~~~~~~~^~~~~ usr.sbin/pmc/cmd_pmc_record.cc:89:25: note: shadowed declaration is here 89 | uint64_t count; | ^~~~~ usr.sbin/pmc/cmd_pmc_record.cc:96:39: error: declaration of 'event' shadows a member of 'pmc_config' [-Werror=shadow] 96 | pmc_config(const std::string &event, uint64_t count, cpuset_t cpumask) | ~~~~~~~~~~~~~~~~~~~^~~~~ usr.sbin/pmc/cmd_pmc_record.cc:88:25: note: shadowed declaration is here 88 | std::string event; | ^~~~~ Reported by: GCC 15 Fixes: a79a051e7d16 ("pmc: pmc record command") --- usr.sbin/pmc/cmd_pmc_record.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/pmc/cmd_pmc_record.cc b/usr.sbin/pmc/cmd_pmc_record.cc index a8373b330705..cff0db7fc9c7 100644 --- a/usr.sbin/pmc/cmd_pmc_record.cc +++ b/usr.sbin/pmc/cmd_pmc_record.cc @@ -93,10 +93,11 @@ public: { CPU_ZERO(&cpumask); } - pmc_config(const std::string &event, uint64_t count, cpuset_t cpumask) - : event(event), count(count), ids() + pmc_config(const std::string &_event, uint64_t _count, + cpuset_t _cpumask) + : event(_event), count(_count), ids() { - CPU_COPY(&cpumask, &this->cpumask); + CPU_COPY(&_cpumask, &cpumask); } /* * Read the capabilities and fills in the cpumask for a given event