summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Holmen <mikael.holmen@ericsson.com>2019-06-27 08:16:18 +0000
committerMikael Holmen <mikael.holmen@ericsson.com>2019-06-27 08:16:18 +0000
commit7b81b613686953035f383f17560f9b51f087570e (patch)
tree70757d21b5e5c31d159b47eeea8894afec5c64aa
parenta7cde103c18224f426e613b64ecb228c2154300f (diff)
downloadbcm5719-llvm-7b81b613686953035f383f17560f9b51f087570e.tar.gz
bcm5719-llvm-7b81b613686953035f383f17560f9b51f087570e.zip
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 llvm-svn: 364507
-rw-r--r--llvm/lib/Target/X86/X86ISelLowering.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index 4557c0a1f54..c52446ac155 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/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);
}
}
OpenPOWER on IntegriCloud