[cfe-commits] r91695 - /cfe/trunk/lib/CodeGen/CGCXX.cpp

[Anders Carlsson]

Author: andersca
Date: Fri Dec 18 11:29:21 2009
New Revision: 91695

URL: http://llvm.org/viewvc/llvm-project?rev=91695&view=rev
Log:
CK_UserDefinedConversion is a valid kind when doing copy ctor elision.

Modified:
    cfe/trunk/lib/CodeGen/CGCXX.cpp

Modified: cfe/trunk/lib/CodeGen/CGCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCXX.cpp?rev=91695&r1=91694&r2=91695&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CGCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCXX.cpp Fri Dec 18 11:29:21 2009
@@ -580,7 +580,8 @@
 
     if (const ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(Arg)) {
       assert((ICE->getCastKind() == CastExpr::CK_NoOp ||
-              ICE->getCastKind() == CastExpr::CK_ConstructorConversion) &&
+              ICE->getCastKind() == CastExpr::CK_ConstructorConversion ||
+              ICE->getCastKind() == CastExpr::CK_UserDefinedConversion) &&
              "Unknown implicit cast kind in constructor elision");
       Arg = ICE->getSubExpr();
     }