commit 5868dfcbe19cb2e46797809e061b8077121a4296
author Anders Carlsson <andersca@mac.com> Wed May 27 16:38:58 2009 +0000
committer Anders Carlsson <andersca@mac.com> Wed May 27 16:38:58 2009 +0000
tree cbea0bfcc49da3bc24a569701babbdc6d479c144
parent 6b0e797329996d8648ae7c0efa3aa35789f4c4cf

Fix another test case.

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

lib/Sema/SemaInit.cpp

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 951aaa3..5dc40a4 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -156,6 +156,14 @@
       //      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(),