diff options
author | Daniel Dunbar <daniel@zuster.org> | 2009-11-21 09:14:52 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2009-11-21 09:14:52 +0000 |
commit | e949e6cced1079dbb6eaa7364e6fd5c65864e4c9 (patch) | |
tree | 587d84bdbd011589f6c23c9123fd206189ad693b /clang/lib/CodeGen/CodeGenModule.cpp | |
parent | 161ade4455fd8bccff40f685c91463a7221f7ece (diff) | |
download | bcm5719-llvm-e949e6cced1079dbb6eaa7364e6fd5c65864e4c9.tar.gz bcm5719-llvm-e949e6cced1079dbb6eaa7364e6fd5c65864e4c9.zip |
Mangler: Lift shouldMangleDeclName predicate out of CXXNameMangler::mangle.
- Sometimes we have to mangle things we wouldn't normally (e.g., because they appear in a template expression).
- This also tidies up the predicate to be more obvious what is getting mangled.
llvm-svn: 89555
Diffstat (limited to 'clang/lib/CodeGen/CodeGenModule.cpp')
-rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 8ba3d326189..5744489f2f5 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -160,18 +160,13 @@ const char *CodeGenModule::getMangledName(const GlobalDecl &GD) { /// the unmangled name. /// const char *CodeGenModule::getMangledName(const NamedDecl *ND) { - // In C, functions with no attributes never need to be mangled. Fastpath them. - if (!getLangOptions().CPlusPlus && !ND->hasAttrs()) { + if (!getMangleContext().shouldMangleDeclName(ND)) { assert(ND->getIdentifier() && "Attempt to mangle unnamed decl."); return ND->getNameAsCString(); } llvm::SmallString<256> Name; - if (!getMangleContext().mangleName(ND, Name)) { - assert(ND->getIdentifier() && "Attempt to mangle unnamed decl."); - return ND->getNameAsCString(); - } - + getMangleContext().mangleName(ND, Name); Name += '\0'; return UniqueMangledName(Name.begin(), Name.end()); } |