[llvm] r278567 - gold: add a cast to appease std::max NFC
Saleem Abdulrasool via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 12 14:56:13 PDT 2016
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/gold-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.getCommonSize()));
CommonRes.Align = std::max(CommonRes.Align, ObjSym.getCommonAlignment());
R.Prevailing = false;
}
More information about the llvm-commits
mailing list