From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jason@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2122)
 id 36DDD3858D3C; Tue, 21 Sep 2021 00:53:05 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36DDD3858D3C
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-3720] C++: add type checking for static local vector
 variable in template
X-Act-Checkin: gcc
X-Git-Author: wangpc <pc.wang@linux.alibaba.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 624980241ec69afc7b354f81cc64a1fd77131f3e
X-Git-Newrev: 56c24f18cce0da6405c5071b838844447fa81ac8
Message-Id: <20210921005305.36DDD3858D3C@sourceware.org>
Date: Tue, 21 Sep 2021 00:53:05 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Sep 2021 00:53:05 -0000

https://gcc.gnu.org/g:56c24f18cce0da6405c5071b838844447fa81ac8

commit r12-3720-g56c24f18cce0da6405c5071b838844447fa81ac8
Author: wangpc <pc.wang@linux.alibaba.com>
Date:   Sat Sep 18 13:53:09 2021 +0800

    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.

Diff:
---
 gcc/cp/decl.c                                           | 16 ++++++++--------
 .../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 } */