Sync BaseTools Trunk (version r2387) to EDKII main trunk.

Signed-off-by: lgao4
Reviewed-by: gikidy

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12602 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp

@@ -662,6 +662,13 @@ CFormPkg::DeclarePendingQuestion (
 
       CNObj.SetQuestionId (QId);
       CNObj.SetVarStoreInfo (&Info);
+      //
+      // Numeric doesn't support BOOLEAN data type. 
+      // BOOLEAN type has the same data size to UINT8. 
+      //
+      if (Info.mVarType == EFI_IFR_TYPE_BOOLEAN) {
+        Info.mVarType = EFI_IFR_TYPE_NUM_SIZE_8;
+      }
       CNObj.SetFlags (0, Info.mVarType);
 
       //