<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Aug 12, 2016 at 2:56 PM, Saleem Abdulrasool via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">Author: compnerd<br>
Date: Fri Aug 12 16:56:12 2016<br>
New Revision: 278567<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=278567&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=278567&view=rev</a><br>
Log:<br>
gold: add a cast to appease std::max NFC<br>
<br>
Modified:<br>
    llvm/trunk/tools/gold/gold-<wbr>plugin.cpp<br>
<br>
Modified: llvm/trunk/tools/gold/gold-<wbr>plugin.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/gold-plugin.cpp?rev=278567&r1=278566&r2=278567&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/tools/gold/<wbr>gold-plugin.cpp?rev=278567&r1=<wbr>278566&r2=278567&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/gold/gold-<wbr>plugin.cpp (original)<br>
+++ llvm/trunk/tools/gold/gold-<wbr>plugin.cpp Fri Aug 12 16:56:12 2016<br>
@@ -626,7 +626,8 @@ static void addModule(LTO &Lto, claimed_<br>
         CommonRes.Prevailing = true;<br>
         CommonRes.VisibleToRegularObj = R.VisibleToRegularObj;<br>
       }<br>
-      CommonRes.Size = std::max(CommonRes.Size, ObjSym.getCommonSize());<br>
+      CommonRes.Size = std::max(CommonRes.Size,<br>
+                                static_cast<uint64_t>(ObjSym.<wbr>getCommonSize()));<br></blockquote><div><br></div><div>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?</div><div><br></div><div>Thanks,</div><div>Teresa</div><div><br></div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">
       CommonRes.Align = std::max(CommonRes.Align, ObjSym.getCommonAlignment());<br>
       R.Prevailing = false;<br>
     }<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><span style="font-family:times;font-size:medium"><table cellspacing="0" cellpadding="0"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small"><td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Teresa Johnson |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tejohnson@google.com" target="_blank">tejohnson@google.com</a> |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"> 408-460-2413</td></tr></tbody></table></span></div>
</div></div>