diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2009-09-23 22:34:00 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2009-09-23 22:34:00 +0000 |
| commit | 8f489d692fedeafbb572103d6edca71d7762e83d (patch) | |
| tree | d02c7ee0727f173bd6094bbdff1d7d1fd07a17b0 | |
| parent | eb5758bbfdc5088cd63748451000ec6983ad9bb8 (diff) | |
patch to ir-gen conversion function call used in
initializing a reference class.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82664 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 13 | ||||
| -rw-r--r-- | test/CodeGenCXX/decl-ref-init.cpp | 31 |
2 files changed, 40 insertions, 4 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 4de2de2b64..3e83202575 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/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<CXXMethodDecl>(Best->Function), + Owned(Init)); + Init = InitConversion.takeAs<Expr>(); + + ImpCastExprToType(Init, T1, CastExpr::CK_UserDefinedConversion, + /*isLvalue=*/true); } break; diff --git a/test/CodeGenCXX/decl-ref-init.cpp b/test/CodeGenCXX/decl-ref-init.cpp new file mode 100644 index 0000000000..27d200f463 --- /dev/null +++ b/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 |