[llvm] r278567 - gold: add a cast to appease std::max NFC

[Teresa Johnson via llvm-commits]

On Sat, Aug 13, 2016 at 9:47 PM, Saleem Abdulrasool <compnerd at compnerd.org>
wrote:

> On Sat, Aug 13, 2016 at 9:09 PM, Teresa Johnson <tejohnson at google.com>
> wrote:
>
>>
>>
>> On Fri, Aug 12, 2016 at 2:56 PM, Saleem Abdulrasool via llvm-commits <
>> llvm-commits at lists.llvm.org> wrote:
>>
>>> Author: compnerd
>>> Date: Fri Aug 12 16:56:12 2016
>>> New Revision: 278567
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=278567&view=rev
>>> Log:
>>> gold: add a cast to appease std::max NFC
>>>
>>> Modified:
>>>     llvm/trunk/tools/gold/gold-plugin.cpp
>>>
>>> Modified: llvm/trunk/tools/gold/gold-plugin.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/go
>>> ld-plugin.cpp?rev=278567&r1=278566&r2=278567&view=diff
>>> ============================================================
>>> ==================
>>> --- llvm/trunk/tools/gold/gold-plugin.cpp (original)
>>> +++ llvm/trunk/tools/gold/gold-plugin.cpp Fri Aug 12 16:56:12 2016
>>> @@ -626,7 +626,8 @@ static void addModule(LTO &Lto, claimed_
>>>          CommonRes.Prevailing = true;
>>>          CommonRes.VisibleToRegularObj = R.VisibleToRegularObj;
>>>        }
>>> -      CommonRes.Size = std::max(CommonRes.Size, ObjSym.getCommonSize());
>>> +      CommonRes.Size = std::max(CommonRes.Size,
>>> +                                static_cast<uint64_t>(ObjSym.g
>>> etCommonSize()));
>>>
>>
>> I don't think this should be necessary as I changed getCommonSize to
>> return a uint64_t in r278512. I guess you were trying to fix the issue on
>> the code from earlier in the day and didn't notice my fix in the meantime.
>> Can this be reverted?
>>
>
> Oh, I did miss that.  Sounds reasonable, Ill revert this.
>

Ok, thanks!
Teresa


>
>
>> Thanks,
>> Teresa
>>
>>
>>        CommonRes.Align = std::max(CommonRes.Align,
>>> ObjSym.getCommonAlignment());
>>>        R.Prevailing = false;
>>>      }
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at lists.llvm.org
>>> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>>>
>>
>>
>>
>> --
>> Teresa Johnson |  Software Engineer |  tejohnson at google.com |
>> 408-460-2413
>>
>
>
>
> --
> Saleem Abdulrasool
> compnerd (at) compnerd (dot) org
>



-- 
Teresa Johnson |  Software Engineer |  tejohnson at google.com |  408-460-2413
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160813/d0f77068/attachment.html>