From: Simon Pilgrim <llvm-dev@redking.me.uk>
Date: Wed, 3 May 2017 16:43:57 +0000 (+0000)
Subject: Silence a 'enum and non-enum used in conditional' warning.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eada39d05066ddfd66bb31b4ace851a60d0496a1;p=platform%2Fupstream%2Fllvm.git

Silence a 'enum and non-enum used in conditional' warning.

llvm-svn: 302048
---

diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
index 687dccf..83542aa 100644
--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
@@ -3757,7 +3757,7 @@ X86TargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
   // set X86_INTR calling convention because it has the same CSR mask
   // (same preserved registers).
   const uint32_t *Mask = RegInfo->getCallPreservedMask(
-      MF, HasNCSR ? CallingConv::X86_INTR : CallConv);
+      MF, HasNCSR ? (CallingConv::ID)CallingConv::X86_INTR : CallConv);
   assert(Mask && "Missing call preserved mask for calling convention");
 
   // If this is an invoke in a 32-bit function using a funclet-based