commit 9a0c2a528cab3391cc1c8635155a12fc1d4240b1
author Anders Carlsson <andersca@mac.com> Sat Aug 22 22:30:33 2009 +0000
committer Anders Carlsson <andersca@mac.com> Sat Aug 22 22:30:33 2009 +0000
tree a00d4c3c4a8f201fc5d4f0048bdf7bcbc5159e2e
parent 2e006d2fb6300a00bac983791c3659129417e9db

Add a -fno-elide-constructors option to clang-cc.

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

lib/CodeGen/CGCXX.cpp

diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index ebe6112..7a2c410 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -512,7 +512,7 @@
 
   // Code gen optimization to eliminate copy constructor and return 
   // its first argument instead.
-  if (E->isElidable()) {
+  if (getContext().getLangOptions().ElideConstructors && E->isElidable()) {
     CXXConstructExpr::const_arg_iterator i = E->arg_begin();
     EmitAggExpr((*i), Dest, false);
     return;