From 9ce90d13e38ab2385228a318a02338091faa7d49 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Wed, 23 Sep 2009 22:34:00 +0000 Subject: [PATCH] patch to ir-gen conversion function call used in initializing a reference class. llvm-svn: 82664 --- clang/lib/Sema/SemaDeclCXX.cpp | 13 +++++++---- clang/test/CodeGenCXX/decl-ref-init.cpp | 31 +++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 clang/test/CodeGenCXX/decl-ref-init.cpp diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 4de2de2b6477..3e832025752a 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -3527,10 +3527,15 @@ Sema::CheckReferenceInit(Expr *&Init, QualType DeclType, "Expected a direct reference binding!"); return false; } else { - // Perform the conversion. - // FIXME: Binding to a subobject of the lvalue is going to require more - // AST annotation than this. - ImpCastExprToType(Init, T1, CastExpr::CK_Unknown, /*isLvalue=*/true); + OwningExprResult InitConversion = + BuildCXXCastArgument(Init->getLocStart(), QualType(), + CastExpr::CK_UserDefinedConversion, + cast(Best->Function), + Owned(Init)); + Init = InitConversion.takeAs(); + + ImpCastExprToType(Init, T1, CastExpr::CK_UserDefinedConversion, + /*isLvalue=*/true); } break; diff --git a/clang/test/CodeGenCXX/decl-ref-init.cpp b/clang/test/CodeGenCXX/decl-ref-init.cpp new file mode 100644 index 000000000000..27d200f4635b --- /dev/null +++ b/clang/test/CodeGenCXX/decl-ref-init.cpp @@ -0,0 +1,31 @@ +// RUN: clang-cc -triple x86_64-apple-darwin -S %s -o %t-64.s && +// RUN: FileCheck -check-prefix LP64 --input-file=%t-64.s %s && +// RUN: clang-cc -triple i386-apple-darwin -S %s -o %t-32.s && +// RUN: FileCheck -check-prefix LP32 --input-file=%t-32.s %s && +// RUN: true + +struct A {}; + +struct B +{ + operator A&(); +}; + + +struct D : public B { + operator A(); +}; + +extern B f(); +extern D d(); + +int main() { + const A& rca = f(); + const A& rca2 = d(); +} + +// CHECK-LP64: call __ZN1BcvR1AEv +// CHECK-LP64: call __ZN1BcvR1AEv + +// CHECK-LP32: call L__ZN1BcvR1AEv +// CHECK-LP32: call L__ZN1BcvR1AEv