<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Feb 19, 2016 at 4:29 PM, Richard Smith via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div><div>On Thu, Feb 18, 2016 at 5:52 PM, Nico Weber via cfe-commits<br>
<<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br>
> Author: nico<br>
> Date: Thu Feb 18 19:52:46 2016<br>
> New Revision: 261297<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=261297&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=261297&view=rev</a><br>
> Log:<br>
> Implement the likely resolution of core issue 253.<br>
><br>
> C++11 requires const objects to have a user-provided constructor, even for<br>
> classes without any fields. DR 253 relaxes this to say "If the implicit default<br>
> constructor initializes all subobjects, no initializer should be required."<br>
><br>
> clang is currently the only compiler that implements this C++11 rule, and e.g.<br>
> libstdc++ relies on something like DR 253 to compile in newer versions. This<br>
> change makes it possible to build code that says `const vector<int> v;' again<br>
> when using libstdc++5.2 and _GLIBCXX_DEBUG<br>
> (<a href="https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60284" rel="noreferrer" target="_blank">https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60284</a>).<br>
><br>
> Fixes PR23381.<br>
><br>
> <a href="http://reviews.llvm.org/D16552" rel="noreferrer" target="_blank">http://reviews.llvm.org/D16552</a><br>
><br>
> Modified:<br>
> cfe/trunk/include/clang/AST/DeclCXX.h<br>
> cfe/trunk/lib/AST/ASTImporter.cpp<br>
> cfe/trunk/lib/AST/DeclCXX.cpp<br>
> cfe/trunk/lib/Sema/SemaInit.cpp<br>
> cfe/trunk/lib/Serialization/ASTReaderDecl.cpp<br>
> cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
> cfe/trunk/test/CXX/dcl.decl/dcl.fct.def/dcl.fct.def.default/p2.cpp<br>
> cfe/trunk/test/CXX/dcl.decl/dcl.init/p6.cpp<br>
> cfe/trunk/test/CXX/drs/dr4xx.cpp<br>
> cfe/trunk/test/SemaCXX/attr-selectany.cpp<br>
> cfe/trunk/test/SemaCXX/constexpr-value-init.cpp<br>
> cfe/trunk/test/SemaCXX/cxx0x-cursory-default-delete.cpp<br>
> cfe/trunk/test/SemaCXX/illegal-member-initialization.cpp<br>
> cfe/trunk/www/cxx_dr_status.html<br>
><br>
> Modified: cfe/trunk/include/clang/AST/DeclCXX.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/include/clang/AST/DeclCXX.h (original)<br>
> +++ cfe/trunk/include/clang/AST/DeclCXX.h Thu Feb 18 19:52:46 2016<br>
> @@ -378,6 +378,10 @@ class CXXRecordDecl : public RecordDecl<br>
> /// even if the class has a trivial default constructor.<br>
> bool HasUninitializedReferenceMember : 1;<br>
><br>
> + /// \brief True if any non-mutable field whose type doesn't have a user-<br>
> + /// provided default ctor also doesn't have an in-class initializer.<br>
> + bool HasUninitializedFields : 1;<br>
> +<br>
> /// \brief These flags are \c true if a defaulted corresponding special<br>
> /// member can't be fully analyzed without performing overload resolution.<br>
> /// @{<br>
> @@ -1270,6 +1274,13 @@ public:<br>
> return !(data().HasTrivialSpecialMembers & SMF_Destructor);<br>
> }<br>
><br>
> + /// \brief Determine whether declaring a const variable with this type is ok<br>
> + /// per core issue 253.<br>
> + bool allowConstDefaultInit() const {<br>
> + return !data().HasUninitializedFields ||<br>
> + hasUserProvidedDefaultConstructor();<br>
<br>
</div></div>hasUserProvidedDefaultConstructor() here is subtly incorrect. We<br>
shouldn't care whether there's a user-provided default constructor, we<br>
instead care whether the constructor that would have been chosen for<br>
initialization is defaulted (or equivalently, whether there *is* a<br>
defaulted default constructor, since if there is one, then either the<br>
initialization is ambiguous or it is chosen).<br>
<br>
This causes a regression for a testcase such as:<br>
<br>
struct X { template<typename ...T> X(T...); int n; };<br>
const X x; // formerly OK, now bogus error<br></blockquote><div><br></div><div>Hm, great point. For a single hop, this fixes it:</div><div><br></div><div><div>Index: lib/Sema/SemaInit.cpp</div><div>===================================================================</div><div>--- lib/Sema/SemaInit.cpp<span style="white-space:pre-wrap"> </span>(revision 261298)</div><div>+++ lib/Sema/SemaInit.cpp<span style="white-space:pre-wrap"> </span>(working copy)</div><div>@@ -3521,7 +3521,7 @@</div><div> // The 253 proposal is for example needed to process libstdc++ headers in 5.x.</div><div> CXXConstructorDecl *CtorDecl = cast<CXXConstructorDecl>(Best->Function);</div><div> if (Kind.getKind() == InitializationKind::IK_Default &&</div><div>- Entity.getType().isConstQualified()) {</div><div>+ Entity.getType().isConstQualified() && !CtorDecl->isUserProvided()) {</div><div> if (!CtorDecl->getParent()->allowConstDefaultInit()) {</div><div> if (!maybeRecoverWithZeroInitialization(S, Sequence, Entity))</div><div> Sequence.SetFailed(InitializationSequence::FK_DefaultInitOfConst);</div></div><div><br></div><div><br></div><div>However, it doesn't make this pass:</div><div><br></div><div><div>struct X { template<typename ...T> X(T...); int n; };</div><div>struct Y { X x; };</div><div>const Y y;</div></div><div><br></div><div>That didn't build before this change either, but it feels like this should be ok after this change. I think what you're suggesting is to conceptually do this instead:</div><div><br></div><div><div>Index: include/clang/AST/DeclCXX.h</div><div>===================================================================</div><div>--- include/clang/AST/DeclCXX.h<span class="" style="white-space:pre"> </span>(revision 261298)</div><div>+++ include/clang/AST/DeclCXX.h<span class="" style="white-space:pre"> </span>(working copy)</div><div>@@ -1277,8 +1277,10 @@</div><div> /// \brief Determine whether declaring a const variable with this type is ok</div><div> /// per core issue 253.</div><div> bool allowConstDefaultInit() const {</div><div>- return !data().HasUninitializedFields ||</div><div>- hasUserProvidedDefaultConstructor();</div><div>+ if (!data().HasUninitializedFields)</div><div>+ return true;</div><div>+ CXXConstructorDecl *CD = S.LookupDefaultConstructor(ClassDecl);</div><div>+ return !CD->isDefaulted();</div><div> }</div><div> </div><div> /// \brief Determine whether this class has a destructor which has no</div></div><div><br></div><div>Now AST can't access Sema of course, so one way to do this would be to look up the default ctor for every record in sema when completeDefinition() for a record is called and then do</div><div><br></div><div> if (!CD->isDefaulted())</div><div> RD->setAllowConstDefaultInit(true);</div><div><br></div><div>But looking up the constructor is a bit more expensive than the current computation, so maybe it makes sense to go back to lazy computation of this information? Do you have any preferences for how to implement this?</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div><div><br>
> + }<br>
> +<br>
> /// \brief Determine whether this class has a destructor which has no<br>
> /// semantic effect.<br>
> ///<br>
><br>
> Modified: cfe/trunk/lib/AST/ASTImporter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTImporter.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTImporter.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/AST/ASTImporter.cpp (original)<br>
> +++ cfe/trunk/lib/AST/ASTImporter.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -2024,6 +2024,7 @@ bool ASTNodeImporter::ImportDefinition(R<br>
> ToData.HasInClassInitializer = FromData.HasInClassInitializer;<br>
> ToData.HasUninitializedReferenceMember<br>
> = FromData.HasUninitializedReferenceMember;<br>
> + ToData.HasUninitializedFields = FromData.HasUninitializedFields;<br>
> ToData.NeedOverloadResolutionForMoveConstructor<br>
> = FromData.NeedOverloadResolutionForMoveConstructor;<br>
> ToData.NeedOverloadResolutionForMoveAssignment<br>
><br>
> Modified: cfe/trunk/lib/AST/DeclCXX.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclCXX.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclCXX.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/AST/DeclCXX.cpp (original)<br>
> +++ cfe/trunk/lib/AST/DeclCXX.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -46,34 +46,31 @@ void LazyASTUnresolvedSet::getFromExtern<br>
> }<br>
><br>
> CXXRecordDecl::DefinitionData::DefinitionData(CXXRecordDecl *D)<br>
> - : UserDeclaredConstructor(false), UserDeclaredSpecialMembers(0),<br>
> - Aggregate(true), PlainOldData(true), Empty(true), Polymorphic(false),<br>
> - Abstract(false), IsStandardLayout(true), HasNoNonEmptyBases(true),<br>
> - HasPrivateFields(false), HasProtectedFields(false), HasPublicFields(false),<br>
> - HasMutableFields(false), HasVariantMembers(false), HasOnlyCMembers(true),<br>
> - HasInClassInitializer(false), HasUninitializedReferenceMember(false),<br>
> - NeedOverloadResolutionForMoveConstructor(false),<br>
> - NeedOverloadResolutionForMoveAssignment(false),<br>
> - NeedOverloadResolutionForDestructor(false),<br>
> - DefaultedMoveConstructorIsDeleted(false),<br>
> - DefaultedMoveAssignmentIsDeleted(false),<br>
> - DefaultedDestructorIsDeleted(false),<br>
> - HasTrivialSpecialMembers(SMF_All),<br>
> - DeclaredNonTrivialSpecialMembers(0),<br>
> - HasIrrelevantDestructor(true),<br>
> - HasConstexprNonCopyMoveConstructor(false),<br>
> - DefaultedDefaultConstructorIsConstexpr(true),<br>
> - HasConstexprDefaultConstructor(false),<br>
> - HasNonLiteralTypeFieldsOrBases(false), ComputedVisibleConversions(false),<br>
> - UserProvidedDefaultConstructor(false), DeclaredSpecialMembers(0),<br>
> - ImplicitCopyConstructorHasConstParam(true),<br>
> - ImplicitCopyAssignmentHasConstParam(true),<br>
> - HasDeclaredCopyConstructorWithConstParam(false),<br>
> - HasDeclaredCopyAssignmentWithConstParam(false),<br>
> - IsLambda(false), IsParsingBaseSpecifiers(false), NumBases(0), NumVBases(0),<br>
> - Bases(), VBases(),<br>
> - Definition(D), FirstFriend() {<br>
> -}<br>
> + : UserDeclaredConstructor(false), UserDeclaredSpecialMembers(0),<br>
> + Aggregate(true), PlainOldData(true), Empty(true), Polymorphic(false),<br>
> + Abstract(false), IsStandardLayout(true), HasNoNonEmptyBases(true),<br>
> + HasPrivateFields(false), HasProtectedFields(false),<br>
> + HasPublicFields(false), HasMutableFields(false), HasVariantMembers(false),<br>
> + HasOnlyCMembers(true), HasInClassInitializer(false),<br>
> + HasUninitializedReferenceMember(false), HasUninitializedFields(false),<br>
> + NeedOverloadResolutionForMoveConstructor(false),<br>
> + NeedOverloadResolutionForMoveAssignment(false),<br>
> + NeedOverloadResolutionForDestructor(false),<br>
> + DefaultedMoveConstructorIsDeleted(false),<br>
> + DefaultedMoveAssignmentIsDeleted(false),<br>
> + DefaultedDestructorIsDeleted(false), HasTrivialSpecialMembers(SMF_All),<br>
> + DeclaredNonTrivialSpecialMembers(0), HasIrrelevantDestructor(true),<br>
> + HasConstexprNonCopyMoveConstructor(false),<br>
> + DefaultedDefaultConstructorIsConstexpr(true),<br>
> + HasConstexprDefaultConstructor(false),<br>
> + HasNonLiteralTypeFieldsOrBases(false), ComputedVisibleConversions(false),<br>
> + UserProvidedDefaultConstructor(false), DeclaredSpecialMembers(0),<br>
> + ImplicitCopyConstructorHasConstParam(true),<br>
> + ImplicitCopyAssignmentHasConstParam(true),<br>
> + HasDeclaredCopyConstructorWithConstParam(false),<br>
> + HasDeclaredCopyAssignmentWithConstParam(false), IsLambda(false),<br>
> + IsParsingBaseSpecifiers(false), NumBases(0), NumVBases(0), Bases(),<br>
> + VBases(), Definition(D), FirstFriend() {}<br>
><br>
> CXXBaseSpecifier *CXXRecordDecl::DefinitionData::getBasesSlowCase() const {<br>
> return Bases.get(Definition->getASTContext().getExternalSource());<br>
> @@ -332,6 +329,9 @@ CXXRecordDecl::setBases(CXXBaseSpecifier<br>
> if (BaseClassDecl->hasUninitializedReferenceMember())<br>
> data().HasUninitializedReferenceMember = true;<br>
><br>
> + if (!BaseClassDecl->allowConstDefaultInit())<br>
> + data().HasUninitializedFields = true;<br>
> +<br>
> addedClassSubobject(BaseClassDecl);<br>
> }<br>
><br>
> @@ -702,6 +702,15 @@ void CXXRecordDecl::addedMember(Decl *D)<br>
> data().IsStandardLayout = false;<br>
> }<br>
><br>
> + if (!Field->hasInClassInitializer() && !Field->isMutable()) {<br>
> + if (CXXRecordDecl *FieldType = Field->getType()->getAsCXXRecordDecl()) {<br>
> + if (!FieldType->allowConstDefaultInit())<br>
> + data().HasUninitializedFields = true;<br>
> + } else {<br>
> + data().HasUninitializedFields = true;<br>
> + }<br>
> + }<br>
> +<br>
> // Record if this field is the first non-literal or volatile field or base.<br>
> if (!T->isLiteralType(Context) || T.isVolatileQualified())<br>
> data().HasNonLiteralTypeFieldsOrBases = true;<br>
><br>
> Modified: cfe/trunk/lib/Sema/SemaInit.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaInit.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Sema/SemaInit.cpp (original)<br>
> +++ cfe/trunk/lib/Sema/SemaInit.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -3515,18 +3515,23 @@ static void TryConstructorInitialization<br>
> // If a program calls for the default initialization of an object<br>
> // of a const-qualified type T, T shall be a class type with a<br>
> // user-provided default constructor.<br>
> + // C++ core issue 253 proposal:<br>
> + // If the implicit default constructor initializes all subobjects, no<br>
> + // initializer should be required.<br>
> + // The 253 proposal is for example needed to process libstdc++ headers in 5.x.<br>
> + CXXConstructorDecl *CtorDecl = cast<CXXConstructorDecl>(Best->Function);<br>
> if (Kind.getKind() == InitializationKind::IK_Default &&<br>
> - Entity.getType().isConstQualified() &&<br>
> - !cast<CXXConstructorDecl>(Best->Function)->isUserProvided()) {<br>
> - if (!maybeRecoverWithZeroInitialization(S, Sequence, Entity))<br>
> - Sequence.SetFailed(InitializationSequence::FK_DefaultInitOfConst);<br>
> - return;<br>
> + Entity.getType().isConstQualified()) {<br>
> + if (!CtorDecl->getParent()->allowConstDefaultInit()) {<br>
> + if (!maybeRecoverWithZeroInitialization(S, Sequence, Entity))<br>
> + Sequence.SetFailed(InitializationSequence::FK_DefaultInitOfConst);<br>
> + return;<br>
> + }<br>
> }<br>
><br>
> // C++11 [over.match.list]p1:<br>
> // In copy-list-initialization, if an explicit constructor is chosen, the<br>
> // initializer is ill-formed.<br>
> - CXXConstructorDecl *CtorDecl = cast<CXXConstructorDecl>(Best->Function);<br>
> if (IsListInit && !Kind.AllowExplicit() && CtorDecl->isExplicit()) {<br>
> Sequence.SetFailed(InitializationSequence::FK_ExplicitConstructor);<br>
> return;<br>
><br>
> Modified: cfe/trunk/lib/Serialization/ASTReaderDecl.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderDecl.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReaderDecl.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Serialization/ASTReaderDecl.cpp (original)<br>
> +++ cfe/trunk/lib/Serialization/ASTReaderDecl.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -1412,6 +1412,7 @@ void ASTDeclReader::ReadCXXDefinitionDat<br>
> Data.HasOnlyCMembers = Record[Idx++];<br>
> Data.HasInClassInitializer = Record[Idx++];<br>
> Data.HasUninitializedReferenceMember = Record[Idx++];<br>
> + Data.HasUninitializedFields = Record[Idx++];<br>
> Data.NeedOverloadResolutionForMoveConstructor = Record[Idx++];<br>
> Data.NeedOverloadResolutionForMoveAssignment = Record[Idx++];<br>
> Data.NeedOverloadResolutionForDestructor = Record[Idx++];<br>
> @@ -1536,6 +1537,7 @@ void ASTDeclReader::MergeDefinitionData(<br>
> MATCH_FIELD(HasOnlyCMembers)<br>
> MATCH_FIELD(HasInClassInitializer)<br>
> MATCH_FIELD(HasUninitializedReferenceMember)<br>
> + MATCH_FIELD(HasUninitializedFields)<br>
> MATCH_FIELD(NeedOverloadResolutionForMoveConstructor)<br>
> MATCH_FIELD(NeedOverloadResolutionForMoveAssignment)<br>
> MATCH_FIELD(NeedOverloadResolutionForDestructor)<br>
><br>
> Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)<br>
> +++ cfe/trunk/lib/Serialization/ASTWriter.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -5547,6 +5547,7 @@ void ASTWriter::AddCXXDefinitionData(con<br>
> Record.push_back(Data.HasOnlyCMembers);<br>
> Record.push_back(Data.HasInClassInitializer);<br>
> Record.push_back(Data.HasUninitializedReferenceMember);<br>
> + Record.push_back(Data.HasUninitializedFields);<br>
> Record.push_back(Data.NeedOverloadResolutionForMoveConstructor);<br>
> Record.push_back(Data.NeedOverloadResolutionForMoveAssignment);<br>
> Record.push_back(Data.NeedOverloadResolutionForDestructor);<br>
><br>
> Modified: cfe/trunk/test/CXX/dcl.decl/dcl.fct.def/dcl.fct.def.default/p2.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.decl/dcl.fct.def/dcl.fct.def.default/p2.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.decl/dcl.fct.def/dcl.fct.def.default/p2.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/CXX/dcl.decl/dcl.fct.def/dcl.fct.def.default/p2.cpp (original)<br>
> +++ cfe/trunk/test/CXX/dcl.decl/dcl.fct.def/dcl.fct.def.default/p2.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -116,6 +116,7 @@ static_assert(!noexcept(e5 = e5), "");<br>
> namespace PR13492 {<br>
> struct B {<br>
> B() = default;<br>
> + int field;<br>
> };<br>
><br>
> void f() {<br>
><br>
> Modified: cfe/trunk/test/CXX/dcl.decl/dcl.init/p6.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.decl/dcl.init/p6.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.decl/dcl.init/p6.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/CXX/dcl.decl/dcl.init/p6.cpp (original)<br>
> +++ cfe/trunk/test/CXX/dcl.decl/dcl.init/p6.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -4,9 +4,9 @@<br>
><br>
> // If a program calls for the default initialization of an object of a<br>
> // const-qualified type T, T shall be a class type with a<br>
> -// user-provided default constructor.<br>
> +// user-provided default constructor, except if T has no uninitialized fields.<br>
> struct MakeNonPOD { MakeNonPOD(); };<br>
> -struct NoUserDefault : public MakeNonPOD { };<br>
> +struct NoUserDefault : public MakeNonPOD { int field; };<br>
> struct HasUserDefault { HasUserDefault(); };<br>
><br>
> void test_const_default_init() {<br>
> @@ -16,7 +16,7 @@ void test_const_default_init() {<br>
> }<br>
><br>
> // rdar://8501008<br>
> -struct s0 {};<br>
> +struct s0 { int field; };<br>
> struct s1 { static const s0 foo; };<br>
> const struct s0 s1::foo; // expected-error{{default initialization of an object of const type 'const struct s0' without a user-provided default constructor}}<br>
><br>
><br>
> Modified: cfe/trunk/test/CXX/drs/dr4xx.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr4xx.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/drs/dr4xx.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/CXX/drs/dr4xx.cpp (original)<br>
> +++ cfe/trunk/test/CXX/drs/dr4xx.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -1197,12 +1197,12 @@ namespace dr496 { // dr496: no<br>
> int check6[ __is_trivially_assignable(B, const B&) ? 1 : -1];<br>
> }<br>
><br>
> -namespace dr497 { // dr497: yes<br>
> +namespace dr497 { // dr497: sup 253<br>
> void before() {<br>
> struct S {<br>
> mutable int i;<br>
> };<br>
> - const S cs; // expected-error {{default initialization}}<br>
> + const S cs;<br>
> int S::*pm = &S::i;<br>
> cs.*pm = 88; // expected-error {{not assignable}}<br>
> }<br>
><br>
> Modified: cfe/trunk/test/SemaCXX/attr-selectany.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/attr-selectany.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/attr-selectany.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/SemaCXX/attr-selectany.cpp (original)<br>
> +++ cfe/trunk/test/SemaCXX/attr-selectany.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -39,7 +39,9 @@ __declspec(selectany) auto x8 = Internal<br>
> // The D3D11 headers do something like this. MSVC doesn't error on this at<br>
> // all, even without the __declspec(selectany), in violation of the standard.<br>
> // We fall back to a warning for selectany to accept headers.<br>
> -struct SomeStruct {};<br>
> +struct SomeStruct {<br>
> + int foo;<br>
> +};<br>
> extern const __declspec(selectany) SomeStruct some_struct; // expected-warning {{default initialization of an object of const type 'const SomeStruct' without a user-provided default constructor is a Microsoft extension}}<br>
><br>
> // It should be possible to redeclare variables that were defined<br>
><br>
> Modified: cfe/trunk/test/SemaCXX/constexpr-value-init.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/constexpr-value-init.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/constexpr-value-init.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/SemaCXX/constexpr-value-init.cpp (original)<br>
> +++ cfe/trunk/test/SemaCXX/constexpr-value-init.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -14,7 +14,7 @@ void f() {<br>
> constexpr A a; // expected-error {{constant expression}} expected-note {{in call to 'A()'}}<br>
> }<br>
><br>
> -constexpr B b1; // expected-error {{without a user-provided default constructor}}<br>
> +constexpr B b1; // ok<br>
> constexpr B b2 = B(); // ok<br>
> static_assert(b2.a.a == 1, "");<br>
> static_assert(b2.a.b == 2, "");<br>
><br>
> Modified: cfe/trunk/test/SemaCXX/cxx0x-cursory-default-delete.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-cursory-default-delete.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-cursory-default-delete.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/SemaCXX/cxx0x-cursory-default-delete.cpp (original)<br>
> +++ cfe/trunk/test/SemaCXX/cxx0x-cursory-default-delete.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -11,6 +11,7 @@ struct non_const_copy {<br>
> non_const_copy& operator = (non_const_copy&) &;<br>
> non_const_copy& operator = (non_const_copy&) &&;<br>
> non_const_copy() = default; // expected-note {{not viable}}<br>
> + int uninit_field;<br>
> };<br>
> non_const_copy::non_const_copy(non_const_copy&) = default; // expected-note {{not viable}}<br>
> non_const_copy& non_const_copy::operator = (non_const_copy&) & = default; // expected-note {{not viable}}<br>
> @@ -30,6 +31,65 @@ void fn1 () {<br>
> ncc = cncc; // expected-error {{no viable overloaded}}<br>
> };<br>
><br>
> +struct no_fields { };<br>
> +struct all_init {<br>
> + int a = 0;<br>
> + int b = 0;<br>
> +};<br>
> +struct some_init {<br>
> + int a = 0;<br>
> + int b;<br>
> + int c = 0;<br>
> +};<br>
> +struct some_init_mutable {<br>
> + int a = 0;<br>
> + mutable int b;<br>
> + int c = 0;<br>
> +};<br>
> +struct some_init_def {<br>
> + some_init_def() = default;<br>
> + int a = 0;<br>
> + int b;<br>
> + int c = 0;<br>
> +};<br>
> +struct some_init_ctor {<br>
> + some_init_ctor();<br>
> + int a = 0;<br>
> + int b;<br>
> + int c = 0;<br>
> +};<br>
> +struct sub_some_init : public some_init_def { };<br>
> +struct sub_some_init_ctor : public some_init_def {<br>
> + sub_some_init_ctor();<br>
> +};<br>
> +struct sub_some_init_ctor2 : public some_init_ctor {<br>
> +};<br>
> +struct some_init_container {<br>
> + some_init_def sid;<br>
> +};<br>
> +struct some_init_container_ctor {<br>
> + some_init_container_ctor();<br>
> + some_init_def sid;<br>
> +};<br>
> +struct no_fields_container {<br>
> + no_fields nf;<br>
> +};<br>
> +<br>
> +void constobjs() {<br>
> + const no_fields nf; // ok<br>
> + const all_init ai; // ok<br>
> + const some_init si; // expected-error {{default initialization of an object of const type 'const some_init' without a user-provided default constructor}}<br>
> + const some_init_mutable sim; // ok<br>
> + const some_init_def sid; // expected-error {{default initialization of an object of const type 'const some_init_def' without a user-provided default constructor}}<br>
> + const some_init_ctor sic; // ok<br>
> + const sub_some_init ssi; // expected-error {{default initialization of an object of const type 'const sub_some_init' without a user-provided default constructor}}<br>
> + const sub_some_init_ctor ssic; // ok<br>
> + const sub_some_init_ctor2 ssic2; // ok<br>
> + const some_init_container sicon; // expected-error {{default initialization of an object of const type 'const some_init_container' without a user-provided default constructor}}<br>
> + const some_init_container_ctor siconc; // ok<br>
> + const no_fields_container nfc; // ok<br>
> +}<br>
> +<br>
> struct non_const_derived : non_const_copy {<br>
> non_const_derived(const non_const_derived&) = default; // expected-error {{requires it to be non-const}}<br>
> non_const_derived& operator =(non_const_derived&) = default;<br>
><br>
> Modified: cfe/trunk/test/SemaCXX/illegal-member-initialization.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/illegal-member-initialization.cpp?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/illegal-member-initialization.cpp?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/test/SemaCXX/illegal-member-initialization.cpp (original)<br>
> +++ cfe/trunk/test/SemaCXX/illegal-member-initialization.cpp Thu Feb 18 19:52:46 2016<br>
> @@ -7,6 +7,7 @@ struct A {<br>
> };<br>
><br>
> struct B {<br>
> + int field;<br>
> };<br>
><br>
> struct X {<br>
><br>
> Modified: cfe/trunk/www/cxx_dr_status.html<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/www/cxx_dr_status.html?rev=261297&r1=261296&r2=261297&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/www/cxx_dr_status.html?rev=261297&r1=261296&r2=261297&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/www/cxx_dr_status.html (original)<br>
> +++ cfe/trunk/www/cxx_dr_status.html Thu Feb 18 19:52:46 2016<br>
> @@ -3023,7 +3023,7 @@ of class templates</td><br>
> <td><a href="<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#497" rel="noreferrer" target="_blank">http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#497</a>">497</a></td><br>
> <td>CD1</td><br>
> <td>Missing required initialization in example</td><br>
> - <td class="full" align="center">Yes</td><br>
> + <td class="none" align="center">Superseded by <a href="#253">253</a></td><br>
> </tr><br>
> <tr class="open" id="498"><br>
> <td><a href="<a href="http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#498" rel="noreferrer" target="_blank">http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_active.html#498</a>">498</a></td><br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</div></div></blockquote></div><br></div></div>