diff options
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 4 | ||||
| -rw-r--r-- | test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 0e5a02f342..cab7661898 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -6179,8 +6179,8 @@ Sema::CanPerformCopyInitialization(const InitializedEntity &Entity, Expr *InitE = Init.get(); assert(InitE && "No initialization expression"); - InitializationKind Kind = InitializationKind::CreateCopy(SourceLocation(), - SourceLocation()); + InitializationKind Kind + = InitializationKind::CreateCopy(InitE->getLocStart(), SourceLocation()); InitializationSequence Seq(*this, Entity, Kind, &InitE, 1); return !Seq.Failed(); } diff --git a/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp b/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp index 7384309f97..f11e19ae6f 100644 --- a/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp +++ b/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp @@ -175,3 +175,15 @@ namespace PR12436 { X x({}, 17); } + +namespace rdar11948732 { + template<typename T> struct X {}; + + struct XCtorInit { + XCtorInit(std::initializer_list<X<int>>); + }; + + void f(X<int> &xi) { + XCtorInit xc = { xi, xi }; + } +} |