diff --git a/MdePkg/Include/Library/PerformanceLib.h b/MdePkg/Include/Library/PerformanceLib.h
index 711e3fc06f..5ca72d4fd0 100644
--- a/MdePkg/Include/Library/PerformanceLib.h
+++ b/MdePkg/Include/Library/PerformanceLib.h
@@ -734,7 +734,12 @@ LogPerformanceMeasurement (
   Otherwise, the source lines between PERF_CODE_BEGIN() and PERF_CODE_END() are not included in a module.
 
 **/
-#define PERF_CODE_BEGIN()  do { if (PerformanceMeasurementEnabled ()) { UINT8  __PerformanceCodeLocal
+#define PERF_CODE_BEGIN()            \
+  do {                               \
+    BOOLEAN  __PerformanceCodeLocal; \
+    __PerformanceCodeLocal = FALSE;  \
+    do {                             \
+      if (PerformanceMeasurementEnabled ()) {
 
 /**
   Macro that marks the end of performance measurement source code.
@@ -744,7 +749,10 @@ LogPerformanceMeasurement (
   Otherwise, the source lines between PERF_CODE_BEGIN() and PERF_CODE_END() are not included in a module.
 
 **/
-#define PERF_CODE_END()  __PerformanceCodeLocal = 0; __PerformanceCodeLocal++; } } while (FALSE)
+#define PERF_CODE_END()                \
+      }                                \
+    } while (__PerformanceCodeLocal);  \
+  } while (FALSE)
 
 /**
   Macro that declares a section of performance measurement source code.