From d93a10c02bd963cc11670a9e02ce396764838768 Mon Sep 17 00:00:00 2001
From: Jeff Fan <jeff.fan@intel.com>
Date: Fri, 14 Oct 2016 14:40:58 +0800
Subject: [PATCH 1/1] UefiCpuPkg/Cpuid: Remove wrong while-loop check after
 for-loop

while-loop check should not co-exist with for-loop. This should be typo when we
check-in the original code. We should keep one loop only.

This issue caused CLANG38 build failure reported by
https://tianocore.acgmultimedia.com/show_bug.cgi?id=148

Contributed-under: TianoCore Contribution Agreement 1.0
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---
 UefiCpuPkg/Application/Cpuid/Cpuid.c | 3 +--
 UefiCpuPkg/Include/Register/Cpuid.h  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c
index 8726a85f4e..ac14c41ed6 100644
--- a/UefiCpuPkg/Application/Cpuid/Cpuid.c
+++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c
@@ -617,8 +617,7 @@ CpuidStructuredExtendedFeatureFlags (
       PRINT_BIT_FIELD (Ecx, PKU);
       PRINT_BIT_FIELD (Ecx, OSPKE);
     }
-    SubLeaf++;
-  } while (SubLeaf <= Eax);
+  }
 }
 
 /**
diff --git a/UefiCpuPkg/Include/Register/Cpuid.h b/UefiCpuPkg/Include/Register/Cpuid.h
index eb24840746..864108da62 100644
--- a/UefiCpuPkg/Include/Register/Cpuid.h
+++ b/UefiCpuPkg/Include/Register/Cpuid.h
@@ -1275,8 +1275,7 @@ typedef union {
       SubLeaf,
       NULL, &Ebx.Uint32, &Ecx.Uint32, NULL
       );
-    SubLeaf++;
-  } while (SubLeaf <= Eax);
+  }
   @endcode
 **/
 #define CPUID_STRUCTURED_EXTENDED_FEATURE_FLAGS                0x07
-- 
2.39.2