[llvm] r278622 - Revert "gold: add a cast to appease std::max NFC"
Saleem Abdulrasool via llvm-commits
llvm-commits at lists.llvm.org
Sat Aug 13 22:07:20 PDT 2016
Author: compnerd
Date: Sun Aug 14 00:07:20 2016
New Revision: 278622
URL: http://llvm.org/viewvc/llvm-project?rev=278622&view=rev
Log:
Revert "gold: add a cast to appease std::max NFC"
This was fixed differently by Teresa and this should no longer be needed.
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=278622&r1=278621&r2=278622&view=diff
==============================================================================
--- llvm/trunk/tools/gold/gold-plugin.cpp (original)
+++ llvm/trunk/tools/gold/gold-plugin.cpp Sun Aug 14 00:07:20 2016
@@ -626,8 +626,7 @@ static void addModule(LTO &Lto, claimed_
CommonRes.Prevailing = true;
CommonRes.VisibleToRegularObj = R.VisibleToRegularObj;
}
- CommonRes.Size = std::max(CommonRes.Size,
- static_cast<uint64_t>(ObjSym.getCommonSize()));
+ CommonRes.Size = std::max(CommonRes.Size, ObjSym.getCommonSize());
CommonRes.Align = std::max(CommonRes.Align, ObjSym.getCommonAlignment());
R.Prevailing = false;
}
More information about the llvm-commits
mailing list