From: Eli Friedman Date: Sat, 19 May 2012 23:35:23 +0000 (+0000) Subject: Make delegating initializers use a similar codepath to base initializers in dependent... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d21016f0b6d9dfcce9cd9f2d1451286e75d9de48;p=clang Make delegating initializers use a similar codepath to base initializers in dependent contexts. PR12890. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@157136 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 9571a26845..676063ac08 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -2234,6 +2234,16 @@ Sema::BuildDelegatingInitializer(TypeSourceInfo *TInfo, Expr *Init, if (DelegationInit.isInvalid()) return true; + // If we are in a dependent context, template instantiation will + // perform this type-checking again. Just save the arguments that we + // received in a ParenListExpr. + // FIXME: This isn't quite ideal, since our ASTs don't capture all + // of the information that we have about the base + // initializer. However, deconstructing the ASTs is a dicey process, + // and this approach is far more likely to get the corner cases right. + if (CurContext->isDependentContext()) + DelegationInit = Owned(Init); + return new (Context) CXXCtorInitializer(Context, TInfo, InitRange.getBegin(), DelegationInit.takeAs(), InitRange.getEnd()); diff --git a/test/SemaTemplate/delegating-constructors.cpp b/test/SemaTemplate/delegating-constructors.cpp index e177b50375..852b89d809 100644 --- a/test/SemaTemplate/delegating-constructors.cpp +++ b/test/SemaTemplate/delegating-constructors.cpp @@ -29,3 +29,21 @@ namespace PR10457 { Foo f(1, 1); } } + +namespace PR12890 { + class Document + { + public: + Document() = default; + + template + explicit + Document(T&& t) : Document() + { + } + }; + void f() + { + Document d(1); + } +}