diff options
| author | Jason Merrill <jason@redhat.com> | 2024-10-22 16:37:49 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2024-10-22 17:56:23 -0400 |
| commit | 71e13ea134b04562f8f2cdd9c4a55dbb0905f96a (patch) | |
| tree | a0e869c15fabe7a84ba58ce7cc628ceea6ccaea6 | |
| parent | 5c6c1aba338d1e563e3da2c5e255f490f0865994 (diff) | |
| download | gcc-71e13ea134b04562f8f2cdd9c4a55dbb0905f96a.zip gcc-71e13ea134b04562f8f2cdd9c4a55dbb0905f96a.tar.gz gcc-71e13ea134b04562f8f2cdd9c4a55dbb0905f96a.tar.bz2 | |
c++: non-dep structured binding decltype again [PR117107]
The patch for PR92687 handled the usual case of a decomp variable not being
in the table, but missed the case of there being nothing in the table yet.
PR c++/117107
PR c++/92687
gcc/cp/ChangeLog:
* decl.cc (lookup_decomp_type): Handle null table.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/decomp10.C: New test.
| -rw-r--r-- | gcc/cp/decl.cc | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/decomp10.C | 21 |
2 files changed, 24 insertions, 2 deletions
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 7281818..354b224 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -9446,8 +9446,9 @@ static GTY((cache)) decl_tree_cache_map *decomp_type_table; tree lookup_decomp_type (tree v) { - if (tree *slot = decomp_type_table->get (v)) - return *slot; + if (decomp_type_table) + if (tree *slot = decomp_type_table->get (v)) + return *slot; return NULL_TREE; } diff --git a/gcc/testsuite/g++.dg/cpp2a/decomp10.C b/gcc/testsuite/g++.dg/cpp2a/decomp10.C new file mode 100644 index 0000000..8fe425b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/decomp10.C @@ -0,0 +1,21 @@ +// PR c++/117107 +// { dg-do compile { target c++11 } } +// { dg-options "" } + +template <typename, typename> +constexpr bool is_same = false; // { dg-warning "variable template" "" { target c++11_down } } +template <typename T> +constexpr bool is_same<T, T> = true; // { dg-warning "variable template" "" { target c++11_down } } + +struct tuple { + template <unsigned long I> + void check_tuple_like() { + tuple t; + auto [v, r] = t; // { dg-warning "structured bindings" "" { target c++14_down } } + (void)[v, r] { // { dg-warning "captured structured" "" { target c++17_down } } + decltype(v) x; + }; + } + int a = 0; + int &b = a; +}; |