[llvm] r268928 - [mips] Try to fix 'truncation from FindBestPredicateResult to bool' reported by MSVC

Daniel Sanders via llvm-commits llvm-commits at lists.llvm.org
Mon May 9 08:50:15 PDT 2016


Author: dsanders
Date: Mon May  9 10:50:15 2016
New Revision: 268928

URL: http://llvm.org/viewvc/llvm-project?rev=268928&view=rev
Log:
[mips] Try to fix 'truncation from FindBestPredicateResult to bool' reported by MSVC


Modified:
    llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp

Modified: llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp?rev=268928&r1=268927&r2=268928&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp Mon May  9 10:50:15 2016
@@ -167,9 +167,9 @@ static unsigned getMatchingLoType(const
 /// A matching relocation is unbeatable if:
 /// - It is not already involved in a match.
 /// - It's offset is exactly that of the one given in R.
-static bool isMatchingReloc(const MipsRelocationEntry &X,
-                            const ELFRelocationEntry &R,
-                            unsigned MatchingType) {
+static FindBestPredicateResult isMatchingReloc(const MipsRelocationEntry &X,
+                                               const ELFRelocationEntry &R,
+                                               unsigned MatchingType) {
   if (X.R.Type == MatchingType && X.R.OriginalSymbol == R.OriginalSymbol) {
     if (!X.Matched &&
         X.R.OriginalAddend == R.OriginalAddend)




More information about the llvm-commits mailing list