<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Dec 10, 2013 at 12:50 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</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 class=""><div class="h5">On Tue, Dec 10, 2013 at 12:25 AM, Richard Smith<br>

<<a href="mailto:richard-llvm@metafoo.co.uk">richard-llvm@metafoo.co.uk</a>> wrote:<br>
> Author: rsmith<br>
> Date: Tue Dec 10 02:25:00 2013<br>
> New Revision: 196892<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=196892&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=196892&view=rev</a><br>
> Log:<br>
> Implement DR1460: fix handling of default initializers in unions; don't allow<br>
> more than one such initializer in a union, make mem-initializers override<br>
> default initializers for other union members, handle anonymous unions with<br>
> anonymous struct members better. Fix a couple of semi-related bugs exposed by<br>
> the tests for same.<br>
><br>
> Added:<br>
>     cfe/trunk/test/CXX/class/class.union/p8.cpp<br>
>     cfe/trunk/test/CXX/drs/dr14xx.cpp<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/SemaDecl.cpp<br>
>     cfe/trunk/lib/Sema/SemaDeclCXX.cpp<br>
>     cfe/trunk/lib/Sema/SemaExpr.cpp<br>
>     cfe/trunk/lib/Serialization/ASTReaderDecl.cpp<br>
>     cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
>     cfe/trunk/test/CXX/special/class.init/class.base.init/p8-0x.cpp<br>
>     cfe/trunk/test/CodeGenCXX/member-init-anon-union.cpp<br>
><br>> Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=196892&r1=196891&r2=196892&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=196892&r1=196891&r2=196892&view=diff</a><br>

> ==============================================================================<br>
> --- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)<br>
> +++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Tue Dec 10 02:25:00 2013<br>> @@ -3320,6 +3331,7 @@ struct BaseAndFieldInfo {<br>
>    ImplicitInitializerKind IIK;<br>
>    llvm::DenseMap<const void *, CXXCtorInitializer*> AllBaseFields;<br>
>    SmallVector<CXXCtorInitializer*, 8> AllToInit;<br>
> +  llvm::DenseMap<TagDecl*, FieldDecl*> ActiveUnionMember;<br>
><br>
>    BaseAndFieldInfo(Sema &S, CXXConstructorDecl *Ctor, bool ErrorsInInits)<br>
>      : S(S), Ctor(Ctor), AnyErrorsInInits(ErrorsInInits) {<br>
> @@ -3357,20 +3369,50 @@ struct BaseAndFieldInfo {<br>
><br>
>      return false;<br>
>    }<br>
> -};<br>
> -}<br>
><br>
> -/// \brief Determine whether the given indirect field declaration is somewhere<br>
> -/// within an anonymous union.<br>
> -static bool isWithinAnonymousUnion(IndirectFieldDecl *F) {<br>
> -  for (IndirectFieldDecl::chain_iterator C = F->chain_begin(),<br>
> -                                      CEnd = F->chain_end();<br>
> -       C != CEnd; ++C)<br>
> -    if (CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>((*C)->getDeclContext()))<br>
> -      if (Record->isUnion())<br>
> +  bool isInactiveUnionMember(FieldDecl *Field) {<br>
> +    RecordDecl *Record = Field->getParent();<br>
> +    if (!Record->isUnion())<br>
> +      return false;<br>
> +<br>
> +    FieldDecl *Active = ActiveUnionMember.lookup(Record->getCanonicalDecl());<br>
> +    if (Active)<br>
<br>
</div></div>Collapse the initialization into the conditional here?</blockquote><div><br></div><div>Sounds good, r196959.</div></div></div></div>