From 31976591dee494994f2546c72c23e1e35a9c1555 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Sat, 29 Aug 2009 19:15:16 +0000 Subject: [PATCH] Patch for code gen. for c-style cast which ends in using class's conversion functions [12.3.2-p2] git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@80433 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExpr.cpp | 13 +++++++------ lib/CodeGen/CGExprAgg.cpp | 8 ++++++-- lib/CodeGen/CGExprScalar.cpp | 7 +++++-- lib/Sema/SemaExpr.cpp | 13 +++++++++++++ lib/Sema/SemaExprCXX.cpp | 1 + test/CodeGenCXX/conversion-function.cpp | 9 +++++++++ 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 24442c3a73..400d45ffe5 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -1173,8 +1173,13 @@ LValue CodeGenFunction::EmitConditionalOperator(const ConditionalOperator* E) { /// noop aggregate casts, and cast from scalar to union. LValue CodeGenFunction::EmitCastLValue(const CastExpr *E) { if (E->getCastKind() == CastExpr::CK_UserDefinedConversion) { - const CXXFunctionalCastExpr *CXXFExpr = cast(E); - return LValue::MakeAddr(EmitCXXFunctionalCastExpr(CXXFExpr).getScalarVal(), 0); + if (const CXXFunctionalCastExpr *CXXFExpr = + dyn_cast(E)) + return LValue::MakeAddr( + EmitCXXFunctionalCastExpr(CXXFExpr).getScalarVal(), 0); + assert(isa(E) && + "EmitCastLValue - Expected CStyleCastExpr"); + return EmitLValue(E->getSubExpr()); } // If this is an aggregate-to-aggregate cast, just use the input's address as @@ -1188,10 +1193,6 @@ LValue CodeGenFunction::EmitCastLValue(const CastExpr *E) { if (ICE->isLvalueCast()) return EmitLValue(E->getSubExpr()); - // FIXME: Implement this properly! - if (E->getCastKind() == CastExpr::CK_UserDefinedConversion) - return EmitUnsupportedLValue(E, "user-defined conversion"); - // Otherwise, we must have a cast from scalar to union. assert(E->getCastKind() == CastExpr::CK_ToUnion && "Expected scalar-to-union cast"); diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp index 002c77430f..4155738a22 100644 --- a/lib/CodeGen/CGExprAgg.cpp +++ b/lib/CodeGen/CGExprAgg.cpp @@ -178,8 +178,12 @@ void AggExprEmitter::VisitCastExpr(CastExpr *E) { return; } if (E->getCastKind() == CastExpr::CK_UserDefinedConversion) { - CXXFunctionalCastExpr *CXXFExpr = cast(E); - CGF.EmitCXXFunctionalCastExpr(CXXFExpr); + if (const CXXFunctionalCastExpr *CXXFExpr = + dyn_cast(E)) + CGF.EmitCXXFunctionalCastExpr(CXXFExpr); + else + if (isa(E)) + Visit(E->getSubExpr()); return; } diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 299296a633..f3a841dbb2 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -228,8 +228,11 @@ public: } Value *VisitCastExpr(const CastExpr *E) { if (E->getCastKind() == CastExpr::CK_UserDefinedConversion) { - const CXXFunctionalCastExpr *CXXFExpr = cast(E); - return CGF.EmitCXXFunctionalCastExpr(CXXFExpr).getScalarVal(); + if (const CXXFunctionalCastExpr *CXXFExpr = + dyn_cast(E)) + return CGF.EmitCXXFunctionalCastExpr(CXXFExpr).getScalarVal(); + assert(isa(E) && + "VisitCastExpr - missing CStyleCastExpr"); } // Make sure to evaluate VLA bounds now so that we have them for later. diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 474ddf0635..cfb9eb658d 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -3060,6 +3060,19 @@ Sema::ActOnCastExpr(Scope *S, SourceLocation LParenLoc, TypeTy *Ty, if (CheckCastTypes(SourceRange(LParenLoc, RParenLoc), castType, castExpr, Kind, ConversionDecl)) return ExprError(); + if (ConversionDecl) { + // encounterred a c-style cast requiring a conversion function. + if (CXXConversionDecl *CD = dyn_cast(ConversionDecl)) { + castExpr = + new (Context) CXXFunctionalCastExpr(castType.getNonReferenceType(), + castType, LParenLoc, + CastExpr::CK_UserDefinedConversion, + castExpr, CD, + RParenLoc); + Kind = CastExpr::CK_UserDefinedConversion; + } + // FIXME. AST for when dealing with conversion functions (FunctionDecl). + } Op.release(); return Owned(new (Context) CStyleCastExpr(castType.getNonReferenceType(), diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index fe67ec6fac..16e83e6514 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -939,6 +939,7 @@ Sema::PerformImplicitConversion(Expr *&From, QualType ToType, OwningExprResult InitResult = BuildCXXConstructExpr(ToType.getNonReferenceType(), CD, &From, 1); + // Take ownership of this expression. From = InitResult.takeAs(); CastKind = CastExpr::CK_ConstructorConversion ; } diff --git a/test/CodeGenCXX/conversion-function.cpp b/test/CodeGenCXX/conversion-function.cpp index 5961157951..f3c0e33bf1 100644 --- a/test/CodeGenCXX/conversion-function.cpp +++ b/test/CodeGenCXX/conversion-function.cpp @@ -49,6 +49,15 @@ int main() { i = int(X(Z(y))); f = float(X(Z(y))); printf("i = %d float = %f\n", i,f); + f = (float)x; + i = (int)x; + printf("i = %d float = %f\n", i,f); + + int d = (X)((Z)y); + printf("d = %d\n", d); + + int e = (int)((X)((Z)y)); + printf("e = %d\n", e); } // CHECK-LP64: .globl __ZN1ScviEv // CHECK-LP64-NEXT: __ZN1ScviEv: -- 2.40.0