commit cb9efbe6d727d2eb8a62fd7df2a91055b037f11b
author Alexey Samsonov <samsonov@google.com> Fri Apr 05 07:47:28 2013 +0000
committer Alexey Samsonov <samsonov@google.com> Fri Apr 05 07:47:28 2013 +0000
tree f89b864218a0ff2c0d8e417615aad20eb8bb7f63
parent 46b8665ea49afebea3161dbad80f81b4d81fd83f

Allow EmitConstantInit() to emit constant initializers for objects with trivial constructors and non-trivial destructors. Test that such objects are ignored by init-order checker.

llvm-svn: 178856

clang/lib/CodeGen/CGExprConstant.cpp

diff --git a/clang/lib/CodeGen/CGExprConstant.cpp b/clang/lib/CodeGen/CGExprConstant.cpp
index e3e5d66..faaf646 100644
--- a/clang/lib/CodeGen/CGExprConstant.cpp
+++ b/clang/lib/CodeGen/CGExprConstant.cpp
@@ -1018,8 +1018,7 @@
       if (const CXXConstructExpr *E =
           dyn_cast_or_null<CXXConstructExpr>(D.getInit())) {
         const CXXConstructorDecl *CD = E->getConstructor();
-        if (CD->isTrivial() && CD->isDefaultConstructor() &&
-            Ty->getAsCXXRecordDecl()->hasTrivialDestructor())
+        if (CD->isTrivial() && CD->isDefaultConstructor())
           return EmitNullConstant(D.getType());
       }
   }