summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-03-05 21:04:41 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-03-05 21:04:41 +0000
commit191b95125a5638d3931094a98a658bd730ff1cbb (patch)
tree59e095664ebf2dd0bdceb6536e9ad3f0a3f8ddff /clang/lib
parent7bea1d42d8cd8c90496b1a3306fc56814cebbde7 (diff)
downloadbcm5719-llvm-191b95125a5638d3931094a98a658bd730ff1cbb.tar.gz
bcm5719-llvm-191b95125a5638d3931094a98a658bd730ff1cbb.zip
Don't produce an alias between destructors with different calling conventions.
Fixes pr19007. llvm-svn: 203007
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/CodeGen/CGCXX.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index ed8c80500b8..99049065712 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -92,7 +92,13 @@ bool CodeGenModule::TryEmitBaseDestructorAsAlias(const CXXDestructorDecl *D) {
if (!ClassLayout.getBaseClassOffset(UniqueBase).isZero())
return true;
+ // Give up if the calling conventions don't match. We could update the call,
+ // but it is probably not worth it.
const CXXDestructorDecl *BaseD = UniqueBase->getDestructor();
+ if (BaseD->getType()->getAs<FunctionType>()->getCallConv() !=
+ D->getType()->getAs<FunctionType>()->getCallConv())
+ return true;
+
return TryEmitDefinitionAsAlias(GlobalDecl(D, Dtor_Base),
GlobalDecl(BaseD, Dtor_Base),
false);
OpenPOWER on IntegriCloud