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

[oota-llvm.git] / lib / IR / Mangler.cpp

diff --git a/lib/IR/Mangler.cpp b/lib/IR/Mangler.cpp
index c7eb666ee0f9405efc9255ed94c5ae7f32c037e0..5eeb7978e2f3c369da86ff88f8e2e5e8c1200615 100644 (file)
--- a/lib/IR/Mangler.cpp
+++ b/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.
   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;
   if (!DL->hasMicrosoftFastStdCallMangling() &&
       CC != CallingConv::X86_VectorCall)
     MSFunc = nullptr;