From: Thomas Schwinge Date: Sun, 2 Apr 2023 09:13:33 +0000 (+0200) Subject: Resolve 'error: unused parameter' in 'gcc/cp/decl2.cc:one_static_initialization_or_de... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=472783f3137475b82baadac31cca31021b69aba9;p=thirdparty%2Fgcc.git Resolve 'error: unused parameter' in 'gcc/cp/decl2.cc:one_static_initialization_or_destruction' [...]/gcc/cp/decl2.cc: In function ‘void one_static_initialization_or_destruction(tree, tree, bool, bool)’: [...]/gcc/cp/decl2.cc:4171:48: error: unused parameter ‘omp_target’ [-Werror=unused-parameter] 4171 | bool omp_target) | ~~~~~^~~~~~~~~~ cc1plus: all warnings being treated as errors make[3]: *** [cp/decl2.o] Error 1 Fix-up for og12 commit abcb5dbac666513c798e574808f849f76a1c0799 "[og12] OpenMP: Constructors and destructors for "declare target" static aggregates". gcc/cp/ * decl2.cc (one_static_initialization_or_destruction): Remove 'omp_target' formal parameter. Adjust all users. --- diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp index e192ead4925e..7a905bb577ea 100644 --- a/gcc/cp/ChangeLog.omp +++ b/gcc/cp/ChangeLog.omp @@ -1,3 +1,8 @@ +2023-04-02 Thomas Schwinge + + * decl2.cc (one_static_initialization_or_destruction): Remove + 'omp_target' formal parameter. Adjust all users. + 2023-03-27 Julian Brown * decl2.cc (priority_info): Add omp_tgt_initializations_p and diff --git a/gcc/cp/decl2.cc b/gcc/cp/decl2.cc index 042ae4df700d..9c0070439631 100644 --- a/gcc/cp/decl2.cc +++ b/gcc/cp/decl2.cc @@ -76,7 +76,7 @@ static tree start_static_storage_duration_function (unsigned, bool); static void finish_static_storage_duration_function (tree); static priority_info get_priority_info (int); static void do_static_initialization_or_destruction (tree, bool, bool); -static void one_static_initialization_or_destruction (tree, tree, bool, bool); +static void one_static_initialization_or_destruction (tree, tree, bool); static void generate_ctor_or_dtor_function (bool, int, location_t *, bool); static int generate_ctor_and_dtor_functions_for_priority (splay_tree_node, void *); @@ -4167,8 +4167,7 @@ fix_temporary_vars_context_r (tree *node, are destroying it. */ static void -one_static_initialization_or_destruction (tree decl, tree init, bool initp, - bool omp_target) +one_static_initialization_or_destruction (tree decl, tree init, bool initp) { tree guard_if_stmt = NULL_TREE; tree guard; @@ -4389,8 +4388,7 @@ do_static_initialization_or_destruction (tree vars, bool initp, bool omp_target) if (omp_target) init = copy_node (init); /* Do one initialization or destruction. */ - one_static_initialization_or_destruction (decl, init, initp, - omp_target); + one_static_initialization_or_destruction (decl, init, initp); } /* Finish up the priority if-stmt body. */ @@ -4854,7 +4852,7 @@ handle_tls_init (void) { tree var = TREE_VALUE (vars); tree init = TREE_PURPOSE (vars); - one_static_initialization_or_destruction (var, init, true, false); + one_static_initialization_or_destruction (var, init, true); /* Output init aliases even with -fno-extern-tls-init. */ if (TARGET_SUPPORTS_ALIASES && TREE_PUBLIC (var))