diff options
| author | wangpc <pc.wang@linux.alibaba.com> | 2021-09-18 13:53:09 +0800 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2021-09-20 20:52:46 -0400 |
| commit | 56c24f18cce0da6405c5071b838844447fa81ac8 (patch) | |
| tree | 16a11409e01b62870a1786052a8b4709f36d6078 | |
| parent | 624980241ec69afc7b354f81cc64a1fd77131f3e (diff) | |
C++: add type checking for static local vector variable in template
This patch moves verify_type_context from start_decl_1 to cp_finish_decl to
do more type checking such as static local vector variable in C++ template.
2021-08-06 wangpc <pc.wang@linux.alibaba.com>
gcc/cp/ChangeLog
* decl.c (start_decl_1): Move verify_type_context to ...
(cp_finish_decl): ... to here.
gcc/testsuite/ChangeLog
* g++.target/aarch64/sve/static-var-in-template.C: New test.
| -rw-r--r-- | gcc/cp/decl.c | 16 | ||||
| -rw-r--r-- | gcc/testsuite/g++.target/aarch64/sve/static-var-in-template.C | 17 |
2 files changed, 25 insertions, 8 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 58ddc6a537e..722e540baba 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5772,14 +5772,6 @@ start_decl_1 (tree decl, bool initialized) cp_apply_type_quals_to_decl (cp_type_quals (type), decl); } - if (is_global_var (decl)) - { - type_context_kind context = (DECL_THREAD_LOCAL_P (decl) - ? TCTX_THREAD_STORAGE - : TCTX_STATIC_STORAGE); - verify_type_context (input_location, context, TREE_TYPE (decl)); - } - if (initialized) /* Is it valid for this decl to have an initializer at all? */ { @@ -7977,6 +7969,14 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, && DECL_INITIALIZED_IN_CLASS_P (decl)) check_static_variable_definition (decl, type); + if (!processing_template_decl && VAR_P (decl) && is_global_var (decl)) + { + type_context_kind context = (DECL_THREAD_LOCAL_P (decl) + ? TCTX_THREAD_STORAGE + : TCTX_STATIC_STORAGE); + verify_type_context (input_location, context, TREE_TYPE (decl)); + } + if (init && TREE_CODE (decl) == FUNCTION_DECL) { tree clone; diff --git a/gcc/testsuite/g++.target/aarch64/sve/static-var-in-template.C b/gcc/testsuite/g++.target/aarch64/sve/static-var-in-template.C new file mode 100644 index 00000000000..74237ff7c57 --- /dev/null +++ b/gcc/testsuite/g++.target/aarch64/sve/static-var-in-template.C @@ -0,0 +1,17 @@ +/* { dg-do compile } */ + +#include <arm_sve.h> + +template <int N> +void f() +{ + static svbool_t pg = svwhilelt_b64(0, N); +} + +int main(int argc, char **argv) +{ + f<2>(); + return 0; +} + +/* { dg-error "SVE type 'svbool_t' does not have a fixed size" "" { target *-*-* } 0 } */ |