projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd09a8f
)
Silencing an "enumeral and non-enumeral type in conditional expression" warning;...
author
Aaron Ballman
<aaron@aaronballman.com>
Tue, 28 Oct 2014 13:12:13 +0000
(13:12 +0000)
committer
Aaron Ballman
<aaron@aaronballman.com>
Tue, 28 Oct 2014 13:12:13 +0000
(13:12 +0000)
llvm-svn: 220775
llvm/lib/IR/Mangler.cpp
patch
|
blob
|
history
diff --git
a/llvm/lib/IR/Mangler.cpp
b/llvm/lib/IR/Mangler.cpp
index
c7eb666
..
5eeb797
100644
(file)
--- 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;