summaryrefslogtreecommitdiffstats
path: root/ShellPkg
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2016-06-30 22:39:00 +0200
committerHao Wu <hao.a.wu@intel.com>2016-07-13 20:43:48 +0800
commitf8e1d8c629ba474d03d2ae8ca7d667649643e682 (patch)
treef1825ebdc6595c9fca100a695b71d24226aa5495 /ShellPkg
parentfbd754a861ba1837c95d09dea8fdf455bd238ccf (diff)
downloadedk2-f8e1d8c629ba474d03d2ae8ca7d667649643e682.tar.gz
edk2-f8e1d8c629ba474d03d2ae8ca7d667649643e682.tar.bz2
edk2-f8e1d8c629ba474d03d2ae8ca7d667649643e682.zip
ShellPkg: UefiHandleParsingLib: remove tautological comparison
The code being removed in this patch dates back to git commit a405b86d274d (Sep 14, 2010; "udk2010.up2.shell initial release."). The condition always evaluates to true, and it breaks DEBUG builds of ArmVirtPkg with gcc-6.1: ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c: In function 'ParseHandleDatabaseByRelationshipWithType': ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c:2465:76: error: self-comparison always evaluates to true [-Werror=tautological-compare] ASSERT((*HandleType)[HandleIndex] == (*HandleType)[HandleIndex]); Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Jaben Carsey <jaben.carsey@intel.com> Cc: Michael Zimmermann <sigmaepsilon92@gmail.com> Reported-by: Gerd Hoffmann <kraxel@redhat.com> Reported-by: Michael Zimmermann <sigmaepsilon92@gmail.com> Suggested-by: Jaben Carsey <jaben.carsey@intel.com> Ref: http://thread.gmane.org/gmane.comp.bios.edk2.devel/13794/focus=13939 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> (cherry picked from commit 42cb906852753a081b8458c7f8742e74eeadefd3)
Diffstat (limited to 'ShellPkg')
-rw-r--r--ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index b82f925c92..6371086525 100644
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
@@ -2460,10 +2460,6 @@ ParseHandleDatabaseByRelationshipWithType (
(*HandleType)[HandleIndex] |= (UINTN)HR_COMPONENT_NAME_HANDLE;
} else if (CompareGuid (ProtocolGuidArray[ProtocolIndex], &gEfiDevicePathProtocolGuid) ) {
(*HandleType)[HandleIndex] |= (UINTN)HR_DEVICE_HANDLE;
- } else {
- DEBUG_CODE_BEGIN();
- ASSERT((*HandleType)[HandleIndex] == (*HandleType)[HandleIndex]);
- DEBUG_CODE_END();
}
//
// Retrieve the list of agents that have opened each protocol