From 001309371e199f0c5f3931b80f67309dcd157848 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Thu, 6 Aug 2009 19:12:38 +0000
Subject: [PATCH] Set and use Elidable in elimination of copy ctors.

llvm-svn: 78331
---
 clang/lib/CodeGen/CGCXX.cpp    | 12 +++---------
 clang/lib/Sema/SemaExprCXX.cpp |  6 ++++--
 clang/lib/Sema/SemaInit.cpp    |  5 +++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index 567c58373cd6..0d51c03bab5f 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -258,16 +258,10 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest,
 
   // Code gen optimization to eliminate copy constructor and return 
   // its first argument instead.
-  const CXXConstructorDecl *CDecl = E->getConstructor();
-  if (E->getNumArgs() == 1 &&
-      CDecl->isCopyConstructor(getContext())) {
+  if (E->isElidable()) {
     CXXConstructExpr::const_arg_iterator i = E->arg_begin();
-    const Expr *SubExpr = (*i);
-    // FIXME. Any other cases can be optimized away?
-    if (isa<CallExpr>(SubExpr) || isa<CXXTemporaryObjectExpr>(SubExpr)) {
-      EmitAggExpr(SubExpr, Dest, false);
-      return;
-    }
+    EmitAggExpr((*i), Dest, false);
+    return;
   }
   // Call the constructor.
   EmitCXXConstructorCall(E->getConstructor(), Ctor_Complete, Dest, 
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp
index 7e0422e432be..5b7493819103 100644
--- a/clang/lib/Sema/SemaExprCXX.cpp
+++ b/clang/lib/Sema/SemaExprCXX.cpp
@@ -911,8 +911,10 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
     assert(!ToType->isReferenceType());
     
     // FIXME: Keep track of whether the copy constructor is elidable or not.
-    From = BuildCXXConstructExpr(Context,
-                                 ToType, SCS.CopyConstructor, false, &From, 1);
+    bool Elidable = (isa<CallExpr>(From) || 
+                     isa<CXXTemporaryObjectExpr>(From));
+    From = BuildCXXConstructExpr(Context, ToType, 
+                                 SCS.CopyConstructor, Elidable, &From, 1);
     return false;
   }
 
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 445cd691d6ad..29113822f730 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -176,9 +176,10 @@ bool Sema::CheckInitializerTypes(Expr *&Init, QualType &DeclType,
                                              DirectInit? IK_Direct : IK_Copy);
         if (!Constructor)
           return true;
-        
+        bool Elidable = (isa<CallExpr>(Init) || 
+                         isa<CXXTemporaryObjectExpr>(Init));
         Init = BuildCXXConstructExpr(Context,
-                                     DeclType, Constructor, false, &Init, 1);
+                                     DeclType, Constructor, Elidable, &Init, 1);
         Init = MaybeCreateCXXExprWithTemporaries(Init, /*DestroyTemps=*/true);
         return false;
       }