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 <[email protected]>
Cc: Gerd Hoffmann <[email protected]>
Cc: Jaben Carsey <[email protected]>
Cc: Michael Zimmermann <[email protected]>
Reported-by: Gerd Hoffmann <[email protected]>
Reported-by: Michael Zimmermann <[email protected]>
Suggested-by: Jaben Carsey <[email protected]>
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 <[email protected]>
---
 ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c 
b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c
index b82f925c9218..63710865251d 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
-- 
1.8.3.1

_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to