diff options
| author | Alan Zhao <ayzhao@google.com> | 2023-05-30 16:27:14 -0700 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2023-06-01 16:59:18 -0700 |
| commit | 185b81e034ba60081023b6e59504dfffb560f3e3 (patch) | |
| tree | 05bcdc017dca3fd7e87350ed1be60e027bdf1a82 | |
| parent | 42f2e6efd84464e2d02f2524b7feecb00efd6ab7 (diff) | |
[clang] Fix crash when passing a braced-init list to a parentehsized aggregate init expressionllvmorg-16.0.5
The previous code incorrectly assumed that we would never call
warnBracedScalarInit(...) with a EK_ParenAggInitMember. This patch fixes
the bug by warning when a scalar member is initialized via a braced-init
list when performing a parentehsized aggregate initialization. This
behavior is consistent with parentehsized list aggregate initialization.
Fixes #63008
Reviewed By: shafik
Differential Revision: https://reviews.llvm.org/D151763
| -rw-r--r-- | clang/docs/ReleaseNotes.rst | 3 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/paren-list-agg-init.cpp | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index ca73b26eacf7..8d67ff904469 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -721,6 +721,9 @@ Bug Fixes in This Version - Fix crash when handling nested immediate invocations in initializers of global variables. (`#58207 <https://github.com/llvm/llvm-project/issues/58207>`_) +- Fix crash when passing a braced initializer list to a parentehsized aggregate + initialization expression. + (`#63008 <https://github.com/llvm/llvm-project/issues/63008>`_). Bug Fixes to Compiler Builtins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 09fd4813f7b8..cc8d1405ec55 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -1152,6 +1152,7 @@ static void warnBracedScalarInit(Sema &S, const InitializedEntity &Entity, case InitializedEntity::EK_Parameter_CF_Audited: case InitializedEntity::EK_TemplateParameter: case InitializedEntity::EK_Result: + case InitializedEntity::EK_ParenAggInitMember: // Extra braces here are suspicious. DiagID = diag::warn_braces_around_init; break; @@ -1186,7 +1187,6 @@ static void warnBracedScalarInit(Sema &S, const InitializedEntity &Entity, case InitializedEntity::EK_LambdaToBlockConversionBlockElement: case InitializedEntity::EK_Binding: case InitializedEntity::EK_StmtExprResult: - case InitializedEntity::EK_ParenAggInitMember: llvm_unreachable("unexpected braced scalar init"); } diff --git a/clang/test/SemaCXX/paren-list-agg-init.cpp b/clang/test/SemaCXX/paren-list-agg-init.cpp index 7bdf49b8fd0c..042ce3b3ddce 100644 --- a/clang/test/SemaCXX/paren-list-agg-init.cpp +++ b/clang/test/SemaCXX/paren-list-agg-init.cpp @@ -266,3 +266,9 @@ O o2(0, 0); // no-error O o3(0); // expected-error@-1 {{reference member of type 'int &&' uninitialized}} } + +namespace gh63008 { +auto a = new A('a', {1.1}); +// expected-warning@-1 {{braces around scalar init}} +// beforecxx20-warning@-2 {{aggregate initialization of type 'A' from a parenthesized list of values is a C++20 extension}} +} |