Author: Dmitry Polukhin Date: 2024-07-11T08:29:09+01:00 New Revision: 00fd188f3744ce7511ebc41260f3fcf34a80ae6b
URL: https://github.com/llvm/llvm-project/commit/00fd188f3744ce7511ebc41260f3fcf34a80ae6b DIFF: https://github.com/llvm/llvm-project/commit/00fd188f3744ce7511ebc41260f3fcf34a80ae6b.diff LOG: [C++20][Modules] static data members of template classes should be allowed in header units (#98309) Summary: There is no sense to report these cases as an error or add `inline` explicitly in these cases, if it is not required in normal headers. Similar to #60079. Test Plan: check-clang Added: Modified: clang/lib/Sema/SemaDecl.cpp clang/test/CXX/module/module.import/p6.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index d1c7b9d5ae507..66eeaa8e6f777 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -13313,7 +13313,8 @@ void Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init, bool DirectInit) { if (getLangOpts().CPlusPlusModules && currentModuleIsHeaderUnit() && !VDecl->isInvalidDecl() && VDecl->isThisDeclarationADefinition() && VDecl->getFormalLinkage() == Linkage::External && !VDecl->isInline() && - !VDecl->isTemplated() && !isa<VarTemplateSpecializationDecl>(VDecl)) { + !VDecl->isTemplated() && !isa<VarTemplateSpecializationDecl>(VDecl) && + !VDecl->getInstantiatedFromStaticDataMember()) { Diag(VDecl->getLocation(), diag::err_extern_def_in_header_unit); VDecl->setInvalidDecl(); } diff --git a/clang/test/CXX/module/module.import/p6.cpp b/clang/test/CXX/module/module.import/p6.cpp index 0ed8b5958dffe..cb2d799e5b565 100644 --- a/clang/test/CXX/module/module.import/p6.cpp +++ b/clang/test/CXX/module/module.import/p6.cpp @@ -67,3 +67,13 @@ void* tmpl_fn_ok inline int foo (int a) { return tmpl_OK (a); } + +template <typename T> struct S2 { static int v; }; +template <typename T> int S2<T>::v = 10; + +template <typename T> bool b() { + bool b1 = S2<T>::v == 10; + return b1 && true; +} + +inline bool B = b<int>(); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
