From: Aaron Ballman <aaron@aaronballman.com>
Date: Tue, 28 Oct 2014 13:12:13 +0000 (+0000)
Subject: Silencing an "enumeral and non-enumeral type in conditional expression" warning;... 
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5af8ba49a6e88734ac8b37ecc6ccbdd0e9f969c1;p=platform%2Fupstream%2Fllvm.git

Silencing an "enumeral and non-enumeral type in conditional expression" warning; NFC.

llvm-svn: 220775
---

diff --git a/llvm/lib/IR/Mangler.cpp b/llvm/lib/IR/Mangler.cpp
index c7eb666..5eeb797 100644
--- a/llvm/lib/IR/Mangler.cpp
+++ b/llvm/lib/IR/Mangler.cpp
@@ -120,7 +120,8 @@ void Mangler::getNameWithPrefix(raw_ostream &OS, const GlobalValue *GV,
   const Function *MSFunc = dyn_cast<Function>(GV);
   if (Name.startswith("\01"))
     MSFunc = nullptr; // Don't mangle when \01 is present.
-  CallingConv::ID CC = MSFunc ? MSFunc->getCallingConv() : CallingConv::C;
+  CallingConv::ID CC =
+      MSFunc ? MSFunc->getCallingConv() : (unsigned)CallingConv::C;
   if (!DL->hasMicrosoftFastStdCallMangling() &&
       CC != CallingConv::X86_VectorCall)
     MSFunc = nullptr;