Author: rafael
Date: Fri Jan 16 09:37:11 2015
New Revision: 226280
URL: http://llvm.org/viewvc/llvm-project?rev=226280&view=rev
Log:
Add comdats to constructs and destructor in the microsoft abi.
Modified:
cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp
cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp
Modified: cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp?rev=226280&r1=226279&r2=226280&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp (original)
+++ cfe/trunk/lib/CodeGen/MicrosoftCXXABI.cpp Fri Jan 16 09:37:11 2015
@@ -3037,7 +3037,8 @@ static void emitCXXConstructor(CodeGenMo
const CXXConstructorDecl *ctor,
StructorType ctorType) {
// There are no constructor variants, always emit the complete destructor.
- CGM.codegenCXXStructor(ctor, StructorType::Complete);
+ llvm::Function *Fn = CGM.codegenCXXStructor(ctor, StructorType::Complete);
+ CGM.maybeSetTrivialComdat(*ctor, *Fn);
}
static void emitCXXDestructor(CodeGenModule &CGM, const CXXDestructorDecl
*dtor,
@@ -3063,7 +3064,8 @@ static void emitCXXDestructor(CodeGenMod
if (dtorType == StructorType::Base &&
!CGM.TryEmitBaseDestructorAsAlias(dtor))
return;
- CGM.codegenCXXStructor(dtor, dtorType);
+ llvm::Function *Fn = CGM.codegenCXXStructor(dtor, dtorType);
+ CGM.maybeSetTrivialComdat(*dtor, *Fn);
}
void MicrosoftCXXABI::emitCXXStructor(const CXXMethodDecl *MD,
Modified: cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp?rev=226280&r1=226279&r2=226280&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/microsoft-abi-structors.cpp Fri Jan 16 09:37:11
2015
@@ -19,7 +19,7 @@ class A {
void no_constructor_destructor_infinite_recursion() {
A a;
-// CHECK: define linkonce_odr x86_thiscallcc %"class.basic::A"*
@"\01??0A@basic@@QAE@XZ"(%"class.basic::A"* returned %this)
+// CHECK: define linkonce_odr x86_thiscallcc %"class.basic::A"*
@"\01??0A@basic@@QAE@XZ"(%"class.basic::A"* returned %this) {{.*}} comdat
{{.*}} {
// CHECK: [[THIS_ADDR:%[.0-9A-Z_a-z]+]] = alloca %"class.basic::A"*,
align 4
// CHECK-NEXT: store %"class.basic::A"* %this, %"class.basic::A"**
[[THIS_ADDR]], align 4
// CHECK-NEXT: [[T1:%[.0-9A-Z_a-z]+]] = load %"class.basic::A"**
[[THIS_ADDR]]
@@ -46,7 +46,7 @@ B::B() {
struct C {
virtual ~C() {
-// DTORS: define linkonce_odr x86_thiscallcc i8*
@"\01??_GC@basic@@UAEPAXI@Z"(%"struct.basic::C"* %this, i32 %should_call_delete)
+// DTORS: define linkonce_odr x86_thiscallcc i8*
@"\01??_GC@basic@@UAEPAXI@Z"(%"struct.basic::C"* %this, i32
%should_call_delete) {{.*}} comdat {{.*}} {
// DTORS: store i32 %should_call_delete, i32*
%[[SHOULD_DELETE_VAR:[0-9a-z._]+]], align 4
// DTORS: store i8* %{{.*}}, i8** %[[RETVAL:[0-9a-z._]+]]
// DTORS: %[[SHOULD_DELETE_VALUE:[0-9a-z._]+]] = load i32*
%[[SHOULD_DELETE_VAR]]
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
