https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66190
--- Comment #8 from Marek Polacek <mpolacek at gcc dot gnu.org> --- Ok, then maybe the following could work (only lightly tested so far). Arguably static_init_p could be renamed to e.g. no_sanitize_p. diff --git gcc/cp/cp-gimplify.c gcc/cp/cp-gimplify.c index d5a64fc..a90c8b7 100644 --- gcc/cp/cp-gimplify.c +++ gcc/cp/cp-gimplify.c @@ -906,6 +906,7 @@ struct cp_genericize_data vec<tree> bind_expr_stack; struct cp_genericize_omp_taskreg *omp_ctx; tree try_block; + bool static_init_p; }; /* Perform any pre-gimplification lowering of C++ front end trees to @@ -1150,6 +1151,21 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data) *stmt_p = build1 (NOP_EXPR, void_type_node, integer_zero_node); *walk_subtrees = 0; } + else if ((flag_sanitize + & (SANITIZE_NULL | SANITIZE_ALIGNMENT | SANITIZE_VPTR)) + && TREE_CODE (stmt) == DECL_EXPR + && VAR_P (DECL_EXPR_DECL (stmt)) + && TREE_STATIC (DECL_EXPR_DECL (stmt)) + && DECL_INITIAL (DECL_EXPR_DECL (stmt))) + { + *walk_subtrees = 0; + /* The point here is to not sanitize static initializers. */ + bool static_init_p = wtd->static_init_p; + wtd->static_init_p = true; + cp_walk_tree (&DECL_INITIAL (DECL_EXPR_DECL (stmt)), cp_genericize_r, + data, NULL); + wtd->static_init_p = static_init_p; + } else if (TREE_CODE (stmt) == OMP_PARALLEL || TREE_CODE (stmt) == OMP_TASK) { struct cp_genericize_omp_taskreg omp_ctx; @@ -1275,9 +1291,10 @@ cp_genericize_r (tree *stmt_p, int *walk_subtrees, void *data) if (*stmt_p == error_mark_node) *stmt_p = size_one_node; return NULL; - } - else if (flag_sanitize - & (SANITIZE_NULL | SANITIZE_ALIGNMENT | SANITIZE_VPTR)) + } + else if ((flag_sanitize + & (SANITIZE_NULL | SANITIZE_ALIGNMENT | SANITIZE_VPTR)) + && !wtd->static_init_p) { if ((flag_sanitize & (SANITIZE_NULL | SANITIZE_ALIGNMENT)) && TREE_CODE (stmt) == NOP_EXPR @@ -1319,6 +1336,7 @@ cp_genericize_tree (tree* t_p) wtd.bind_expr_stack.create (0); wtd.omp_ctx = NULL; wtd.try_block = NULL_TREE; + wtd.static_init_p = false; cp_walk_tree (t_p, cp_genericize_r, &wtd, NULL); delete wtd.p_set; wtd.bind_expr_stack.release ();