1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 7e0422e432..5b74938191 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/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;
   }