maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix some size_t / uint32_t ambiguity errors. 

llvm-svn: 286305
This commit is contained in:
Zachary Turner 2016-11-08 22:30:11 +00:00
parent 4efa0a4201
commit 44728f4014
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/DebugInfo/CodeView/TypeRecordMapping.cpp
View File

@ -50,15 +50,15 @@ static Error mapNameAndUniqueName(CodeViewRecordIO &IO, StringRef &Name,
// Try to be smart about what we write here. We can't write anything too
// large, so if we're going to go over the limit, truncate both the name
// and unique name by the same amount.
uint32_t BytesLeft = IO.maxFieldLength();
size_t BytesLeft = IO.maxFieldLength();
if (HasUniqueName) {
uint32_t BytesNeeded = Name.size() + UniqueName.size() + 2;
size_t BytesNeeded = Name.size() + UniqueName.size() + 2;
StringRef N = Name;
StringRef U = UniqueName;
if (BytesNeeded > BytesLeft) {
uint32_t BytesToDrop = (BytesNeeded - BytesLeft);
uint32_t DropN = std::min(N.size(), BytesToDrop / 2);
uint32_t DropU = std::min(U.size(), BytesToDrop - DropN);
size_t BytesToDrop = (BytesNeeded - BytesLeft);
size_t DropN = std::min(N.size(), BytesToDrop / 2);
size_t DropU = std::min(U.size(), BytesToDrop - DropN);
N = N.drop_back(DropN);
U = U.drop_back(DropU);
@ -67,10 +67,10 @@ static Error mapNameAndUniqueName(CodeViewRecordIO &IO, StringRef &Name,
error(IO.mapStringZ(N));
error(IO.mapStringZ(U));
} else {
uint32_t BytesNeeded = Name.size() + 1;
size_t BytesNeeded = Name.size() + 1;
StringRef N = Name;
if (BytesNeeded > BytesLeft) {
uint32_t BytesToDrop = std::min(N.size(), BytesToDrop);
size_t BytesToDrop = std::min(N.size(), BytesToDrop);
N = N.drop_back(BytesToDrop);
}
error(IO.mapStringZ(N));