diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-12-18 17:29:21 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-12-18 17:29:21 +0000 |
| commit | 28a133d6028df72e614ea1944302334b094339f3 (patch) | |
| tree | 466cfa6dafe8ca51ea64db4534fa9221ef3b8e05 /clang/lib | |
| parent | 029707885c67946e8b82f9e25d7c0e578bc10fc1 (diff) | |
| download | bcm5719-llvm-28a133d6028df72e614ea1944302334b094339f3.tar.gz bcm5719-llvm-28a133d6028df72e614ea1944302334b094339f3.zip | |
CK_UserDefinedConversion is a valid kind when doing copy ctor elision.
llvm-svn: 91695
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/CGCXX.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp index 011257b7499..2d5b4315ada 100644 --- a/clang/lib/CodeGen/CGCXX.cpp +++ b/clang/lib/CodeGen/CGCXX.cpp @@ -580,7 +580,8 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest, 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(); } |
