llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) <details> <summary>Changes</summary> They are like regular record ctors. --- Full diff: https://github.com/llvm/llvm-project/pull/199394.diff 2 Files Affected: - (modified) clang/lib/AST/ByteCode/Compiler.cpp (+2-2) - (modified) clang/test/AST/ByteCode/unions.cpp (+12) ``````````diff diff --git a/clang/lib/AST/ByteCode/Compiler.cpp b/clang/lib/AST/ByteCode/Compiler.cpp index 4d13cd7139f83..1e58d91861ad5 100644 --- a/clang/lib/AST/ByteCode/Compiler.cpp +++ b/clang/lib/AST/ByteCode/Compiler.cpp @@ -6856,8 +6856,8 @@ bool Compiler<Emitter>::compileConstructor(const CXXConstructorDecl *Ctor) { return false; bool IsUnion = R->isUnion(); - // Union copy and move ctors are special. - if (IsUnion && Ctor->isCopyOrMoveConstructor()) { + // Default union copy and move ctors are special. + if (IsUnion && Ctor->isCopyOrMoveConstructor() && Ctor->isDefaulted()) { LocOverrideScope<Emitter> LOS(this, SourceInfo{}); // No special case for NumFields == 0 here, so the Memcpy op diff --git a/clang/test/AST/ByteCode/unions.cpp b/clang/test/AST/ByteCode/unions.cpp index 399c4c891be00..17d868325f1a7 100644 --- a/clang/test/AST/ByteCode/unions.cpp +++ b/clang/test/AST/ByteCode/unions.cpp @@ -386,6 +386,18 @@ namespace CopyCtor { static_assert(y.a == 42, ""); static_assert(y.b == 42, ""); // both-error {{constant expression}} \ // both-note {{'b' of union with active member 'a'}} + + /// Non-defaulted copy ctor. + union U2 { + int a; + constexpr U() : a(100) {} + constexpr U(const U &u) { + a = 20; + }; + }; + constexpr U u2; + constexpr U u22(u2); + static_assert(u22.a == 20); } namespace UnionInBase { `````````` </details> https://github.com/llvm/llvm-project/pull/199394 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
