DynamicTablesPkg: Fix used uninitialized warning from CLANG toolchains

The compiler is not spotting that the inverse of the same conditions has
already been checked, therefore either the 'if' or the 'else if' has to
happen. On the other hand, it is misleading coding to use 'else if' for
something that has to happen given earlier checks.

This fixes the misleading coding and the warning.

We definitely want to keep the warning enabled, as it has caught several
genuine cases of uninitialized use.

Signed-off-by: Mike Beaton <[email protected]>

Author: mikebeaton

DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c

@@ -290,13 +290,6 @@ FixupCmObjectSelfToken (
   }
 
   // Only support Arm and RISC-V objects for now.
-  if ((GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) != EObjNameSpaceArm) &&
-      (GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) != EObjNameSpaceRiscV))
-  {
-    ASSERT (0);
-    return EFI_UNSUPPORTED;
-  }
-
   if (GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) == EObjNameSpaceArm) {
     ArmNamespaceObjId = GET_CM_OBJECT_ID (CmObjDesc->ObjectId);
     if (ArmNamespaceObjId >= EArmObjMax) {
@@ -315,6 +308,12 @@ FixupCmObjectSelfToken (
 
     // Fixup self-token if necessary.
     TokenFixerFunc = RiscVTokenFixer[RiscVNamespaceObjId];
+  } else {
+    ASSERT (
+      (GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) == EObjNameSpaceArm) ||
+      (GET_CM_NAMESPACE_ID (CmObjDesc->ObjectId) == EObjNameSpaceRiscV)
+      );
+    return EFI_UNSUPPORTED;
   }
 
   if (TokenFixerFunc != NULL) {