From: Mikael Holmen <mikael.holmen@ericsson.com>
Date: Thu, 27 Jun 2019 08:16:18 +0000 (+0000)
Subject: Silence gcc warning after r364458
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7d457321d7d124c0083c6f7ebec0bf96f048caa;p=llvm

Silence gcc warning after r364458

Without the fix gcc 7.4.0 complains with

../lib/Target/X86/X86ISelLowering.cpp: In function 'bool getFauxShuffleMask(llvm::SDValue, llvm::SmallVectorImpl<int>&, llvm::SmallVectorImpl<llvm::SDValue>&, llvm::SelectionDAG&)':
../lib/Target/X86/X86ISelLowering.cpp:6690:36: error: enumeral and non-enumeral type in conditional expression [-Werror=extra]
             int Idx = (ZeroMask[j] ? SM_SentinelZero : (i + j + Ofs));
                        ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1plus: all warnings being treated as errors

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

diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 4557c0a1f54..c52446ac155 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -6687,7 +6687,7 @@ static bool getFauxShuffleMask(SDValue N, SmallVectorImpl<int> &Mask,
         for (unsigned i = 0; i != NumSizeInBytes; i += NumBytesPerElt) {
           for (unsigned j = 0; j != NumBytesPerElt; ++j) {
             unsigned Ofs = (SelectMask[j] ? NumSizeInBytes : 0);
-            int Idx = (ZeroMask[j] ? SM_SentinelZero : (i + j + Ofs));
+            int Idx = (ZeroMask[j] ? (int)SM_SentinelZero : (i + j + Ofs));
             Mask.push_back(Idx);
           }
         }