diff options
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
-rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index 99b0829593c..fde28529b71 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -929,6 +929,13 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, // anything here. QualType FromType = From->getType(); + if (SCS.CopyConstructor) { + // FIXME: Create a temporary object by calling the copy + // constructor. + ImpCastExprToType(From, ToType); + return false; + } + // Perform the first implicit conversion. switch (SCS.First) { case ICK_Identity: @@ -982,13 +989,6 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, ImpCastExprToType(From, FromType); break; - case ICK_Derived_To_Base: - // FIXME: This should never happen. It's a consequence of - // pretending that a user-defined conversion via copy constructor - // is actually a standard conversion. - ImpCastExprToType(From, ToType); - break; - default: assert(false && "Improper second standard conversion"); break; |