From d0211181aaf0bdc1748810ceb5d804836caee298 Mon Sep 17 00:00:00 2001 From: Rui Ueyama Date: Wed, 16 Nov 2016 00:38:33 +0000 Subject: [PATCH] Fix Modi and File count if there are more than 65535 modules/files. These numbers are intended to be capped at 65535, but `std::max(UINT16_MAX, N)` always returns N for any N because the expression is the same as `std::max((uint16_t)UINT16_MAX, (uint16_t)N)`. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@287060 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp b/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp index 7001030f9a2..9989c4c6dd7 100644 --- a/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp +++ b/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp @@ -185,8 +185,8 @@ Error DbiStreamBuilder::generateFileInfoSubstream() { WritableStreamRef(FileInfoBuffer).keep_front(NamesOffset); StreamWriter MetadataWriter(MetadataBuffer); - uint16_t ModiCount = std::min(UINT16_MAX, ModuleInfos.size()); - uint16_t FileCount = std::min(UINT16_MAX, SourceFileNames.size()); + uint16_t ModiCount = std::min(UINT16_MAX, ModuleInfos.size()); + uint16_t FileCount = std::min(UINT16_MAX, SourceFileNames.size()); if (auto EC = MetadataWriter.writeInteger(ModiCount)) // NumModules return EC; if (auto EC = MetadataWriter.writeInteger(FileCount)) // NumSourceFiles -- 2.50.1