commit 28a133d6028df72e614ea1944302334b094339f3
author Anders Carlsson <andersca@mac.com> Fri Dec 18 17:29:21 2009 +0000
committer Anders Carlsson <andersca@mac.com> Fri Dec 18 17:29:21 2009 +0000
tree 466cfa6dafe8ca51ea64db4534fa9221ef3b8e05
parent 029707885c67946e8b82f9e25d7c0e578bc10fc1

CK_UserDefinedConversion is a valid kind when doing copy ctor elision.

llvm-svn: 91695

clang/lib/CodeGen/CGCXX.cpp

diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index 011257b..2d5b431 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -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();
     }