[llvm] r237683 - Fix Visual C++ errors C2784, C2780, C2782 after r237678.

Paweł Bylica chfast at gmail.com
Tue May 19 04:27:57 PDT 2015


I reverted that change. Sorry about causing problems.

On Tue, May 19, 2015 at 1:24 PM Yaron Keren <yaron.keren at gmail.com> wrote:

> Author: yrnkrn
> Date: Tue May 19 06:18:10 2015
> New Revision: 237683
>
> URL: http://llvm.org/viewvc/llvm-project?rev=237683&view=rev
> Log:
> Fix Visual C++ errors C2784, C2780, C2782 after r237678.
> It does not like std::min(unsigned, uint32_t).
>
>
> Modified:
>     llvm/trunk/lib/IR/ConstantFold.cpp
>
> Modified: llvm/trunk/lib/IR/ConstantFold.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/ConstantFold.cpp?rev=237683&r1=237682&r2=237683&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/IR/ConstantFold.cpp (original)
> +++ llvm/trunk/lib/IR/ConstantFold.cpp Tue May 19 06:18:10 2015
> @@ -1057,7 +1057,8 @@ Constant *llvm::ConstantFoldBinaryInstru
>
>            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.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150519/69c84930/attachment.html>


More information about the llvm-commits mailing list