[cfe-commits] r82791 - in /cfe/trunk: lib/Sema/SemaExprCXX.cpp test/CodeGenCXX/PR5050-constructor-conversion.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Fri Sep 25 13:59:21 2009
New Revision: 82791

URL: http://llvm.org/viewvc/llvm-project?rev=82791&view=rev
Log:
Refixed pr5050 per Anders comment. Test case enhanced
per Doug's comment.

Modified:
    cfe/trunk/lib/Sema/SemaExprCXX.cpp
    cfe/trunk/test/CodeGenCXX/PR5050-constructor-conversion.cpp

Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=82791&r1=82790&r2=82791&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Fri Sep 25 13:59:21 2009
@@ -1113,9 +1113,22 @@
   if (SCS.CopyConstructor) {
     // FIXME: When can ToType be a reference type?
     assert(!ToType->isReferenceType());
-    if (SCS.Second == ICK_Derived_To_Base)
-      ImpCastExprToType(From, ToType, CastExpr::CK_DerivedToBase,
-                        /*isLvalue=*/true);
+    if (SCS.Second == ICK_Derived_To_Base) {
+      ASTOwningVector<&ActionBase::DeleteExpr> ConstructorArgs(*this);
+      if (CompleteConstructorCall(cast<CXXConstructorDecl>(SCS.CopyConstructor),
+                                  MultiExprArg(*this, (void **)&From, 1),
+                                  /*FIXME:ConstructLoc*/SourceLocation(), 
+                                  ConstructorArgs))
+        return true;
+      OwningExprResult FromResult =
+        BuildCXXConstructExpr(/*FIXME:ConstructLoc*/SourceLocation(),
+                              ToType, SCS.CopyConstructor,
+                              move_arg(ConstructorArgs));
+      if (FromResult.isInvalid())
+        return true;
+      From = FromResult.takeAs<Expr>();
+      return false;
+    }
     OwningExprResult FromResult =
       BuildCXXConstructExpr(/*FIXME:ConstructLoc*/SourceLocation(),
                             ToType, SCS.CopyConstructor,

Modified: cfe/trunk/test/CodeGenCXX/PR5050-constructor-conversion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/PR5050-constructor-conversion.cpp?rev=82791&r1=82790&r2=82791&view=diff

==============================================================================
--- cfe/trunk/test/CodeGenCXX/PR5050-constructor-conversion.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/PR5050-constructor-conversion.cpp Fri Sep 25 13:59:21 2009
@@ -4,7 +4,7 @@
 // RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s &&
 // RUN: true
 
-struct A { A(const A&); };
+struct A { A(const A&, int i1 = 1); };
 
 struct B : A { };
 
@@ -12,8 +12,8 @@
   return b;
 }
 
-// CHECK-LP64: call     __ZN1AC1ERK1A
+// CHECK-LP64: call     __ZN1AC1ERK1Ai
 
-// CHECK-LP32: call     L__ZN1AC1ERK1A
+// CHECK-LP32: call     L__ZN1AC1ERK1Ai