diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 95007f357b766..c92361afe4eaa 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -796,6 +796,7 @@ Bug Fixes to C++ Support - Fixed an assertion failure caused by using ``consteval`` in condition in consumed analyses. (#GH117385) - Fix a crash caused by incorrect argument position in merging deduced template arguments. (#GH113659) - Fixed a parser crash when using pack indexing as a nested name specifier. (#GH119072) +- Fixed a null pointer dereference issue when heuristically computing ``sizeof...(pack)`` expressions. (#GH81436) - Fixed an assertion failure caused by mangled names with invalid identifiers. (#GH112205) - Fixed an incorrect lambda scope of generic lambdas that caused Clang to crash when computing potential lambda captures at the end of a full expression. (#GH115931) diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 14564b99de44c..66c7d0f541a24 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -19297,7 +19297,7 @@ static ExprResult rebuildPotentialResultsAsNonOdrUsed(Sema &S, Expr *E, if (VD->getType()->isReferenceType()) return true; if (auto *RD = VD->getType()->getAsCXXRecordDecl()) - if (RD->hasMutableFields()) + if (RD->hasDefinition() && RD->hasMutableFields()) return true; if (!VD->isUsableInConstantExpressions(S.Context)) return true; diff --git a/clang/test/CXX/temp/temp.decls/temp.variadic/sizeofpack.cpp b/clang/test/CXX/temp/temp.decls/temp.variadic/sizeofpack.cpp index 87c22a0d7e944..50dedb1a158d3 100644 --- a/clang/test/CXX/temp/temp.decls/temp.variadic/sizeofpack.cpp +++ b/clang/test/CXX/temp/temp.decls/temp.variadic/sizeofpack.cpp @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s +// RUN: %clang_cc1 -std=c++20 -fsyntax-only -verify %s // expected-no-diagnostics namespace pr12262 { @@ -201,3 +202,24 @@ void func() } } + +#if __cplusplus >= 202002L +namespace GH81436 { + +template struct Bar; + +template +Bar(E) -> Bar; + +template struct Foo {}; + +// Bar doesn't have to be of a complete type. +template +auto func() requires requires(Bar ...init_lists) { + sizeof...(init_lists) > 0; +} {} + +void f() { func(); } + +} // namespace GH81436 +#endif