diff options
| author | Yaron Keren <yaron.keren@gmail.com> | 2015-05-19 11:18:10 +0000 |
|---|---|---|
| committer | Yaron Keren <yaron.keren@gmail.com> | 2015-05-19 11:18:10 +0000 |
| commit | d90d6fb53a38ca33b75adaedd5f93480336cb55a (patch) | |
| tree | 921a72e1241b31836ce49ab64a22f5e4faa914c9 /llvm/lib | |
| parent | e88a021bf43a122577e99785bf752adbcf557974 (diff) | |
| download | bcm5719-llvm-d90d6fb53a38ca33b75adaedd5f93480336cb55a.tar.gz bcm5719-llvm-d90d6fb53a38ca33b75adaedd5f93480336cb55a.zip | |
Fix Visual C++ errors C2784, C2780, C2782 after r237678.
It does not like std::min(unsigned, uint32_t).
llvm-svn: 237683
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/IR/ConstantFold.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/IR/ConstantFold.cpp b/llvm/lib/IR/ConstantFold.cpp index 16b113df1b8..178612c6a3e 100644 --- a/llvm/lib/IR/ConstantFold.cpp +++ b/llvm/lib/IR/ConstantFold.cpp @@ -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. |
