diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2012-04-20 08:05:00 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2012-04-20 08:05:00 +0000 |
| commit | 8560791791e7b33249feb0ffafeca427076b37b4 (patch) | |
| tree | 8ba2e5066e4e97f6d3259e84895fddd10d88b49f | |
| parent | c93e014cd43b08812370cfc8ef7bb7b92305f8fb (diff) | |
Fix bug 12574 - Avoid infinite recursion in constructors and destructors when using Microsoft C++ ABI
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155189 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGClass.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGenCXX/microsoft-abi-constructors.cpp | 21 |
2 files changed, 24 insertions, 2 deletions
diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 2aedf95e6a..a01cdc0783 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -717,7 +717,8 @@ void CodeGenFunction::EmitConstructorBody(FunctionArgList &Args) { // Before we go any further, try the complete->base constructor // delegation optimization. - if (CtorType == Ctor_Complete && IsConstructorDelegationValid(Ctor)) { + if (CtorType == Ctor_Complete && IsConstructorDelegationValid(Ctor) && + CGM.getContext().getTargetInfo().getCXXABI() != CXXABI_Microsoft) { if (CGDebugInfo *DI = getDebugInfo()) DI->EmitLocation(Builder, Ctor->getLocEnd()); EmitDelegateCXXConstructorCall(Ctor, Ctor_Base, Args); @@ -916,7 +917,7 @@ void CodeGenFunction::EmitDestructorBody(FunctionArgList &Args) { // Enter the cleanup scopes for virtual bases. EnterDtorCleanups(Dtor, Dtor_Complete); - if (!isTryBody) { + if (!isTryBody && CGM.getContext().getTargetInfo().getCXXABI() != CXXABI_Microsoft) { EmitCXXDestructorCall(Dtor, Dtor_Base, /*ForVirtualBase=*/false, LoadCXXThis()); break; diff --git a/test/CodeGenCXX/microsoft-abi-constructors.cpp b/test/CodeGenCXX/microsoft-abi-constructors.cpp new file mode 100644 index 0000000000..ac27f13308 --- /dev/null +++ b/test/CodeGenCXX/microsoft-abi-constructors.cpp @@ -0,0 +1,21 @@ +// RUN: %clang_cc1 -emit-llvm %s -o - -cxx-abi microsoft -triple=i386-pc-win32 | FileCheck %s + +class A { + public: + A() { } + ~A() { } +}; + +void no_contstructor_destructor_infinite_recursion() { + A a; + +// Make sure that the constructor doesn't call itself: +// CHECK: define {{.*}} @"\01??0A@@QAE@XZ" +// CHECK-NOT: call void @"\01??0A@@QAE@XZ" +// CHECK: ret + +// Make sure that the destructor doesn't call itself: +// CHECK: define {{.*}} @"\01??1A@@QAE@XZ" +// CHECK-NOT: call void @"\01??1A@@QAE@XZ" +// CHECK: ret +} |