replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the -cxx-abi microsoft -mconstructor-aliases combination. 

On the microsoft ABI clang is producing one weak_odr and one linkonce_odr
destructor, which is reasonable since only one is required.

The fix is simply to move the assert past the special case treatment of
linkonce_odr.

llvm-svn: 194158
This commit is contained in:
Rafael Espindola 2013-11-06 19:18:55 +00:00
parent 05b7b37021
commit 5fb3a13ba7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/CodeGen/CGCXX.cpp
View File

@ -146,13 +146,13 @@ bool CodeGenModule::TryEmitDefinitionAsAlias(GlobalDecl AliasDecl,
if (!InEveryTU)
return true;
assert(Linkage == TargetLinkage);
// Instead of creating as alias to a linkonce_odr, replace all of the uses
// of the aliassee.
if (TargetLinkage == llvm::GlobalValue::LinkOnceODRLinkage) {
if (Linkage == llvm::GlobalValue::LinkOnceODRLinkage) {
Replacements[MangledName] = Aliasee;
return false;
}
assert(Linkage == TargetLinkage);
}
// Create the alias with no name.

9
clang/test/CodeGenCXX/microsoft-abi-structors-alias.cpp Normal file
View File

@ -0,0 +1,9 @@
// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 -fno-rtti -mconstructor-aliases | FileCheck %s
namespace test1 {
template <typename T> class A {
~A() {}
};
template class A<char>;
// CHECK: define weak_odr x86_thiscallcc void @"\01??1?$A@D@test1@@AAE@XZ"
}