Simplify mangleFunctionDecl by unnesting a crazy condition. This fixes
the check for extern "c" system headers, which should prevent functiondecls
from being mangled.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@73311 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp
index 6ee1223..14392ab 100644
--- a/lib/CodeGen/Mangle.cpp
+++ b/lib/CodeGen/Mangle.cpp
@@ -87,19 +87,20 @@
bool CXXNameMangler::mangleFunctionDecl(const FunctionDecl *FD) {
// Clang's "overloadable" attribute extension to C/C++ implies
// name mangling (always).
- if (FD->hasAttr<OverloadableAttr>()) {
- ; // fall into mangling code unconditionally.
- } else if (// C functions are not mangled
- !Context.getLangOptions().CPlusPlus ||
- // "main" is not mangled in C++
- FD->isMain() ||
- // No mangling in an "implicit extern C" header.
- (FD->getLocation().isValid() &&
- Context.getSourceManager().getFileCharacteristic(FD->getLocation()))
- == SrcMgr::C_ExternCSystem ||
- // No name mangling in a C linkage specification.
- isInCLinkageSpecification(FD))
- return false;
+ if (!FD->hasAttr<OverloadableAttr>()) {
+ // C functions are not mangled, and "main" is never mangled.
+ if (!Context.getLangOptions().CPlusPlus || FD->isMain())
+ return false;
+
+ // No mangling in an "implicit extern C" header.
+ if (FD->getLocation().isValid() &&
+ Context.getSourceManager().isInExternCSystemHeader(FD->getLocation()))
+ return false;
+
+ // No name mangling in a C linkage specification.
+ if (isInCLinkageSpecification(FD))
+ return false;
+ }
// If we get here, mangle the decl name!
Out << "_Z";