diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2011-12-09 23:05:37 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2011-12-09 23:05:37 +0000 |
| commit | 40563cd5ea402b7a0db13058ee869a77cd1ab5ee (patch) | |
| tree | 868bb4cfb65c276bec93db755b6772d989823c8b | |
| parent | 9eed49c2bb0f37bbfefefd0998b6303a686a66c0 (diff) | |
Make array new on a pointer to data member type work correctly. PR11523.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146291 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGExprCXX.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGenCXX/new.cpp | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index ed7605e34b..3f25806155 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -828,7 +828,7 @@ CodeGenFunction::EmitNewArrayInitializer(const CXXNewExpr *E, StoreAnyExprIntoOneUnit(*this, E, curPtr); // Leave the cleanup if we entered one. - if (cleanup != EHStack.stable_end()) { + if (cleanupDominator) { DeactivateCleanupBlock(cleanup, cleanupDominator); cleanupDominator->eraseFromParent(); } @@ -883,7 +883,8 @@ static void EmitNewInitializer(CodeGenFunction &CGF, const CXXNewExpr *E, RequiresZeroInitialization); return; } else if (E->getNumConstructorArgs() == 1 && - isa<ImplicitValueInitExpr>(E->getConstructorArg(0))) { + isa<ImplicitValueInitExpr>(E->getConstructorArg(0)) && + CGF.CGM.getTypes().isZeroInitializable(ElementType)) { // Optimization: since zero initialization will just set the memory // to all zeroes, generate a single memset to do it in one shot. EmitZeroMemSet(CGF, ElementType, NewPtr, AllocSizeWithoutCookie); diff --git a/test/CodeGenCXX/new.cpp b/test/CodeGenCXX/new.cpp index 3a72bb84e7..810a585bca 100644 --- a/test/CodeGenCXX/new.cpp +++ b/test/CodeGenCXX/new.cpp @@ -231,3 +231,11 @@ namespace PR10197 { template void f<int>(); } + +namespace PR11523 { + class MyClass; + typedef int MyClass::* NewTy; + // CHECK: define i64* @_ZN7PR115231fEv + // CHECK: store i64 -1 + NewTy* f() { return new NewTy[2](); } +} |