Fix another test case.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72478 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 951aaa3bc0..5dc40a4593 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -156,6 +156,14 @@ bool Sema::CheckInitializerTypes(Expr *&Init, QualType &DeclType,
       //      class of the destination, constructors are considered.
       if ((DeclTypeC.getUnqualifiedType() == InitTypeC.getUnqualifiedType()) ||
           IsDerivedFrom(InitTypeC, DeclTypeC)) {
+        const CXXRecordDecl *RD = 
+          cast<CXXRecordDecl>(DeclType->getAsRecordType()->getDecl());
+        
+        // No need to make a CXXConstructExpr if both the ctor and dtor are
+        // trivial.
+        if (RD->hasTrivialConstructor() && RD->hasTrivialDestructor())
+          return false;
+        
         CXXConstructorDecl *Constructor 
         = PerformInitializationByConstructor(DeclType, &Init, 1,
                                              InitLoc, Init->getSourceRange(),