From nobody Wed Sep 6 17:11:45 2023 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 4RgpnY6tt1z4sByn; Wed, 6 Sep 2023 17:11:45 +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 4RgpnY6RVHz3WSR; Wed, 6 Sep 2023 17:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694020305; 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=Sh46PjuESf/DMIkVd/ug2zS+z/b7TfdD1cGH/ILvnXk=; b=TTb2DILaHZOvPBCEVmQI53PmxvHOQ6Src/p7w6t02KpR/3DYR46BeCWzbfR8LuxhCNON8h l9e94J1T0havKA7GcyB209EEMXemHp01j2CZv57KQ3RlN4UK2voBypdfpnJLE0hDBY8Gxu oa+zJBRXOE/zZ94yDAgNmhak7kGGIdqmg5mFT5iC7VvNyzgGylijiUm234xz1ZL/tRxZz5 Q5Zir8iVeqVufiK9/qaHEod/a6+ff99o2ofySUHkPlrqqOm4biYUrPL/8idZya6hOSvv/a qPoFGjysZ6qPgDhAjDwqI3ORowrYeqhf2DqIqeK1R6f9Olz+eq2xvEhB3okS5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694020305; a=rsa-sha256; cv=none; b=gTLTBzjG8RbjgYcuyLiWIOWqscBAPNXb8Q6KLRdy9E03dwax3e0GysS1v6eXV6Spr1EGBL 9jPjDYL1V/lXttfNTZmgDRaB/5+VjAzeWfGxXCVfi5707qgDdTCVb5ASC1Nd0bOiH4JPvf lyb5CGx/MkfnCfm88/lY3QvM12n8qoU2wViJYuGq4mwIKyLrIWPMkDDkkHh4HrQOZxD1A7 fO/rpSb5cUgxxI/lQ7Os4uW9Ng5cKd+NO6zHXfbflvZ3zdN2H7OEhXYbDVRl4VGAgdKR49 Xtt9sNCuxIaGpgC7Y3KVj8UIYnIRfD4utmI77c6A0erDmfvVZW3vb/qn12Z8Uw== 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=1694020305; 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=Sh46PjuESf/DMIkVd/ug2zS+z/b7TfdD1cGH/ILvnXk=; b=nrA32UmzAv3+zh/PpsN+HQQ4UbKMMUK1UZa9h/sSHBpTkxp8pqT0CEasJupb/O1jfaDa4p C+3eUr9lMiRK01Yu9nVdZ+EsCTD67pGkzq264YL8yi3F29E64z1W+wPNHCG/1kGbyA1eKM QPV7FKQ6tKPsOkV0rOPVkw0HiWq7SGOCJKwO10EOc7VWVsJo7F7xiLLXL1ykUSEpuSPbAU wZYQ8W/NLAcnn4hkNF7LuI6C/3kGMhaVjIypaLqwntYIIvPjxIRdu7vdPPZnX6FUTq3+f3 YFX/GMdqzeQ04i+4AEkn+BIk6NuL/RD5a/kK/0ddIKa8UayyC5zv7ocbw0yznQ== 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 4RgpnY5VyJz9BH; Wed, 6 Sep 2023 17:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386HBjrr051285; Wed, 6 Sep 2023 17:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HBj2a051282; Wed, 6 Sep 2023 17:11:45 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:11:45 GMT Message-Id: <202309061711.386HBj2a051282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: aacbe7384221 - main - unifdef: Handle redefined symbols correctly. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aacbe7384221d2eafa326864bbbe2f22a10063ce Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=aacbe7384221d2eafa326864bbbe2f22a10063ce commit aacbe7384221d2eafa326864bbbe2f22a10063ce Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 17:11:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-06 17:11:13 +0000 unifdef: Handle redefined symbols correctly. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41758 --- contrib/unifdef/unifdef.c | 6 +++++- usr.bin/unifdef/tests/unifdef_test.sh | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/contrib/unifdef/unifdef.c b/contrib/unifdef/unifdef.c index 82f6acd66038..3dd4ace7b81e 100644 --- a/contrib/unifdef/unifdef.c +++ b/contrib/unifdef/unifdef.c @@ -1550,8 +1550,12 @@ addsym2(bool ignorethis, const char *symname, const char *val) sym->value = val; r = RB_INSERT(MACROMAP, ¯o_tree, sym); assert(r == NULL); + debugsym("addsym", sym); + } else { + sym->ignore = ignorethis; + sym->value = val; + debugsym("updsym", sym); } - debugsym("addsym", sym); } static void diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh index 98adef3adfdc..dfb08c187724 100644 --- a/usr.bin/unifdef/tests/unifdef_test.sh +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -17,6 +17,27 @@ EOF atf_check -o file:f unifdef file <