[PATCH v2] C++: add type checking for static local vector variable in template

[wangpc via Gcc-patches]

This patch moves verify_type_context from start_decl_1 to cp_finish_decl
and adds type checking for static local vector variable in C++ template.

2021-08-06  wangpc  <pc.w...@linux.alibaba.com>

gcc/cp/ChangeLog

        * decl.c (start_decl_1): Remove verify_type_context.
                (cp_finish_decl): Add more type checking.

gcc/testsuite/ChangeLog

        * g++.target/aarch64/sve/static-var-in-template.C: New test.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 90111e4c786..d411963896a 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5491,13 +5491,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?  */
     {
@@ -7520,6 +7513,22 @@ 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))
+    {
+      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 (DECL_FUNCTION_SCOPE_P (decl)
+         && TREE_STATIC (decl))
+       verify_type_context (DECL_SOURCE_LOCATION (decl),
+                            TCTX_STATIC_STORAGE, type);
+    }
+
   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..c2395d18d50
--- /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} } */
-- 
2.33.0.windows.1