diff options
| author | Marek Polacek <polacek@redhat.com> | 2022-05-13 20:09:53 -0400 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2022-05-30 17:10:51 -0400 |
| commit | ff91735a5b861dd6eaf2c1e511f26a9255898e7d (patch) | |
| tree | 0501a6d8dd808ea0a7b8c10677906464309ddde3 | |
| parent | 1ad584d538d349db13cfa8440222d91d5e9aff3f (diff) | |
| download | gcc-ff91735a5b861dd6eaf2c1e511f26a9255898e7d.zip gcc-ff91735a5b861dd6eaf2c1e511f26a9255898e7d.tar.gz gcc-ff91735a5b861dd6eaf2c1e511f26a9255898e7d.tar.bz2 | |
c++: Add !TYPE_P assert to type_dependent_expression_p [PR99080]
As discussed here:
<https://gcc.gnu.org/pipermail/gcc-patches/2021-February/564629.html>,
type_dependent_expression_p should not be called with a type argument.
I promised I'd add an assert so here it is. One place needed adjusting.
PR c++/99080
gcc/cp/ChangeLog:
* pt.cc (type_dependent_expression_p): Assert !TYPE_P.
* semantics.cc (finish_id_expression_1): Handle UNBOUND_CLASS_TEMPLATE
specifically.
| -rw-r--r-- | gcc/cp/pt.cc | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.cc | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index f1f0805..f573ca8 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -27734,6 +27734,8 @@ type_dependent_expression_p (tree expression) if (expression == NULL_TREE || expression == error_mark_node) return false; + gcc_checking_assert (!TYPE_P (expression)); + STRIP_ANY_LOCATION_WRAPPER (expression); /* An unresolved name is always dependent. */ diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index cdc91a3..1d012d6 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -4139,6 +4139,15 @@ finish_id_expression_1 (tree id_expression, } return r; } + else if (TREE_CODE (decl) == UNBOUND_CLASS_TEMPLATE) + { + gcc_checking_assert (scope); + *idk = CP_ID_KIND_QUALIFIED; + cp_warn_deprecated_use_scopes (scope); + decl = finish_qualified_id_expr (scope, decl, done, address_p, + template_p, template_arg_p, + tf_warning_or_error); + } else { bool dependent_p = type_dependent_expression_p (decl); |