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

Fix Visual C++ errors C2784, C2780, C2782 after r237678. 

It does not like std::min(unsigned, uint32_t).

llvm-svn: 237683
This commit is contained in:
Yaron Keren 2015-05-19 11:18:10 +00:00
parent e88a021bf4
commit d90d6fb53a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/IR/ConstantFold.cpp
View File

@ -1057,7 +1057,8 @@ Constant *llvm::ConstantFoldBinaryInstruction(unsigned Opcode,
if (GVAlign > 1) {
unsigned DstWidth = CI2->getType()->getBitWidth();
unsigned SrcWidth = std::min(DstWidth, Log2_32(GVAlign));
unsigned SrcWidth =
std::min(DstWidth, static_cast<unsigned>(Log2_32(GVAlign)));
APInt BitsNotSet(APInt::getLowBitsSet(DstWidth, SrcWidth));
// If checking bits we know are clear, return zero.