Revert "gold: add a cast to appease std::max NFC"
authorSaleem Abdulrasool <compnerd@compnerd.org>
Sun, 14 Aug 2016 05:07:20 +0000 (05:07 +0000)
committerSaleem Abdulrasool <compnerd@compnerd.org>
Sun, 14 Aug 2016 05:07:20 +0000 (05:07 +0000)
This was fixed differently by Teresa and this should no longer be needed.

llvm-svn: 278622

llvm/tools/gold/gold-plugin.cpp

index ecc7527..7f38a02 100644 (file)
@@ -626,8 +626,7 @@ static void addModule(LTO &Lto, claimed_file &F, const void *View) {
         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;
     }