From: Daniel Sanders <daniel.sanders@imgtec.com>
Date: Mon, 9 May 2016 15:50:15 +0000 (+0000)
Subject: [mips] Try to fix 'truncation from FindBestPredicateResult to bool' reported by MSVC
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cc844b0982de242724f44e1763781aaee2ee1a8;p=llvm

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



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@268928 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
index fb184bb3807..9b7f645b135 100644
--- a/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
+++ b/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
@@ -167,9 +167,9 @@ static unsigned getMatchingLoType(const ELFRelocationEntry &Reloc) {
 /// 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)