From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 3F940740035 for ; Thu, 14 Dec 2023 07:28:04 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=bY+4eCWEHZF3DRvj/+QxrukR+R6qGwD4n0zZj8Xifzw=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1702538883; v=1; b=b785XxbUgsYvvFUt9hwHzz8HT9Dwp7fe3MRlIrSLRhWiySegCOcYbucXwb05Q/5FQJaRLKrj +Z9Ny6yGNgn9MKqd4Uq8+cag10jecXr8Z8NYRxYMVp+r1kEosPNujld5c87r9OBCa9YM8ucQVFr TW4dCW2StrQInUoAgl52c4gg= X-Received: by 127.0.0.2 with SMTP id vrY1YY7687511xFmhjzky9Mv; Wed, 13 Dec 2023 23:28:03 -0800 X-Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web11.16917.1702538882792362402 for ; Wed, 13 Dec 2023 23:28:03 -0800 X-Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-40c256ffdbcso80018895e9.2 for ; Wed, 13 Dec 2023 23:28:02 -0800 (PST) X-Gm-Message-State: 3XbBlreSRg1pQ3ilt5pY17NTx7686176AA= X-Google-Smtp-Source: AGHT+IHbHd8NlmuKIH5rykStQTa49ITf0ZFuGSVdFEIZTum80Kk1qggRJKE6GcEtaCFmX9F39EWKRQ== X-Received: by 2002:a05:600c:510e:b0:408:fe93:a2f7 with SMTP id o14-20020a05600c510e00b00408fe93a2f7mr4789509wms.37.1702538880482; Wed, 13 Dec 2023 23:28:00 -0800 (PST) X-Received: from mikes-OptiPlex-3070.lan ([209.240.0.204]) by smtp.gmail.com with ESMTPSA id g20-20020a05600c4ed400b0040c31bb66dcsm23140533wmq.20.2023.12.13.23.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 23:28:00 -0800 (PST) From: "Mike Beaton" To: devel@edk2.groups.io Cc: ardb@google.com, lersek@redhat.com, mcb30@ipxe.org, mikhailkrichanov@gmail.com, Mike Beaton Subject: [edk2-devel] [PATCH V4 1/2] DebugLib: Update DEBUG macro used when MDEPKG_NDEBUG is defined Date: Thu, 14 Dec 2023 07:27:43 +0000 Message-Id: <20231214072743.6432-1-mjsbeaton@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mjsbeaton@gmail.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=b785XxbU; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io From: Mike Beaton The variant provided when MDEPKG_NDEBUG is defined will be optimised away in RELEASE builds, but by referencing the argument list, avoids unused variable errors from valid debug code, for example when STATIC variables are used only in DEBUG statements. Variables EventNames in OvmfPkg/VirtioSerialDxe/VirtioSerial.c was causing this issue in CLANGPDB X64 RELEASE build, prior to this commit. It is also necessary to remove manual work-arounds which had been applied to some similar cases in ArmPkg (see following commit). Signed-off-by: Mike Beaton --- BaseTools/Conf/tools_def.template | 2 +- MdePkg/Include/Library/DebugLib.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index c34ecfd557..eaccf0b698 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -1859,7 +1859,7 @@ DEFINE CLANGDWARF_X64_DLINK2_FLAGS = -Wl,--defsym=PECOFF_HEADER_SIZE=0x22 DEFINE CLANGDWARF_IA32_TARGET = -target i686-pc-linux-gnu DEFINE CLANGDWARF_X64_TARGET = -target x86_64-pc-linux-gnu -DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses-equality -Wno-empty-body -Wno-unused-const-variable -Wno-varargs -Wno-unknown-warning-option -Wno-unused-but-set-variable -Wno-unused-const-variable -Wno-unaligned-access -Wno-unneeded-internal-declaration +DEFINE CLANGDWARF_WARNING_OVERRIDES = -Wno-parentheses-equality -Wno-empty-body -Wno-unused-const-variable -Wno-varargs -Wno-unknown-warning-option -Wno-unused-but-set-variable -Wno-unused-const-variable -Wno-unaligned-access DEFINE CLANGDWARF_ALL_CC_FLAGS = DEF(GCC48_ALL_CC_FLAGS) DEF(CLANGDWARF_WARNING_OVERRIDES) -fno-stack-protector -mms-bitfields -Wno-address -Wno-shift-negative-value -Wno-unknown-pragmas -Wno-incompatible-library-redeclaration -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -msoft-float -mno-implicit-float -ftrap-function=undefined_behavior_has_been_optimized_away_by_clang -funsigned-char -fno-ms-extensions -Wno-null-dereference ########################### diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h index 40772f2e0f..bc7789f01c 100644 --- a/MdePkg/Include/Library/DebugLib.h +++ b/MdePkg/Include/Library/DebugLib.h @@ -426,7 +426,12 @@ UnitTestDebugAssert ( } \ } while (FALSE) #else -#define DEBUG(Expression) +#define DEBUG(Expression) \ + do { \ + if (FALSE) { \ + _DEBUG (Expression); \ + } \ + } while (FALSE) #endif /** -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112500): https://edk2.groups.io/g/devel/message/112500 Mute This Topic: https://groups.io/mt/103166252/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-