From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1059) id D528538708B7; Thu, 27 Aug 2020 18:07:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D528538708B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1598551644; bh=VNigYnmhIHpbG6YkKR2W7Gn1VWlPzaNHb9QurXKLBmw=; h=From:To:Subject:Date:From; b=XO6zPLLDZDzWibyBJiS+Vxm6F+YaIAP3jVQpYv+TEyWxOMLrTXGFmI+ag5g7AFjf6 4TfEEyW7ZfD80Hl5Wx4Eg0ujzsIgIoQj/e6bKFVOHxisHQAQMUZw/c21tt5RqOmpeP SkvNRB07NYwZPftELQLy6VjEPD9QFrhk0gDVXRiE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Nathan Sidwell To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/c++-modules] Replace std::vector<> usage in ipa-fnsummary.c with GCC's vec<>. X-Act-Checkin: gcc X-Git-Author: Aldy Hernandez X-Git-Refname: refs/heads/devel/c++-modules X-Git-Oldrev: 220ffae474db36ba20487427be699f0987a00b0c X-Git-Newrev: 82c4b78dbef6f03838e3040688c934360a09513f Message-Id: <20200827180724.D528538708B7@sourceware.org> Date: Thu, 27 Aug 2020 18:07:24 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2020 18:07:24 -0000 https://gcc.gnu.org/g:82c4b78dbef6f03838e3040688c934360a09513f commit 82c4b78dbef6f03838e3040688c934360a09513f Author: Aldy Hernandez Date: Thu Aug 6 15:32:28 2020 +0200 Replace std::vector<> usage in ipa-fnsummary.c with GCC's vec<>. gcc/ChangeLog: * ipa-fnsummary.c (evaluate_conditions_for_known_args): Use vec<> instead of std::vector<>. (evaluate_properties_for_edge): Same. (ipa_fn_summary_t::duplicate): Same. (estimate_ipcp_clone_size_and_time): Same. * vec.h (::embedded_size): Change vec_embedded type to contain a char[]. Diff: --- gcc/ipa-fnsummary.c | 17 ++++++++--------- gcc/vec.h | 5 ++++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c index 59e52927151..2cfab40156e 100644 --- a/gcc/ipa-fnsummary.c +++ b/gcc/ipa-fnsummary.c @@ -331,7 +331,7 @@ static void evaluate_conditions_for_known_args (struct cgraph_node *node, bool inline_p, vec known_vals, - const std::vector &known_value_ranges, + vec known_value_ranges, vec known_aggs, clause_t *ret_clause, clause_t *ret_nonspec_clause) @@ -446,7 +446,7 @@ evaluate_conditions_for_known_args (struct cgraph_node *node, continue; } } - if (c->operand_num < (int) known_value_ranges.size () + if (c->operand_num < (int) known_value_ranges.length () && !c->agg_contents && !known_value_ranges[c->operand_num].undefined_p () && !known_value_ranges[c->operand_num].varying_p () @@ -555,7 +555,7 @@ evaluate_properties_for_edge (struct cgraph_edge *e, bool inline_p, { struct cgraph_node *callee = e->callee->ultimate_alias_target (); class ipa_fn_summary *info = ipa_fn_summaries->get (callee); - std::vector known_value_ranges (32); + auto_vec known_value_ranges; class ipa_edge_args *args; if (clause_ptr) @@ -630,11 +630,11 @@ evaluate_properties_for_edge (struct cgraph_edge *e, bool inline_p, i)); if (!vr.undefined_p () && !vr.varying_p ()) { - if (!known_value_ranges.size ()) + if (!known_value_ranges.length ()) { - known_value_ranges.resize (count); + known_value_ranges.safe_grow (count); for (int i = 0; i < count; ++i) - known_value_ranges[i].set_undefined (); + new (&known_value_ranges[i]) value_range (); } known_value_ranges[i] = vr; } @@ -808,7 +808,7 @@ ipa_fn_summary_t::duplicate (cgraph_node *src, } evaluate_conditions_for_known_args (dst, false, known_vals, - std::vector (), + vNULL, vNULL, &possible_truths, /* We are going to specialize, @@ -3692,8 +3692,7 @@ estimate_ipcp_clone_size_and_time (struct cgraph_node *node, clause_t clause, nonspec_clause; /* TODO: Also pass known value ranges. */ - evaluate_conditions_for_known_args (node, false, known_vals, - std::vector (), + evaluate_conditions_for_known_args (node, false, known_vals, vNULL, known_aggs, &clause, &nonspec_clause); ipa_call_context ctx (node, clause, nonspec_clause, known_vals, known_contexts, diff --git a/gcc/vec.h b/gcc/vec.h index 3ad99b83690..db48e979d77 100644 --- a/gcc/vec.h +++ b/gcc/vec.h @@ -1281,7 +1281,10 @@ template inline size_t vec::embedded_size (unsigned alloc) { - typedef vec vec_embedded; + struct alignas (T) U { char data[sizeof (T)]; }; + typedef vec vec_embedded; + static_assert (sizeof (vec_embedded) == sizeof(vec), ""); + static_assert (alignof (vec_embedded) == alignof(vec), ""); return offsetof (vec_embedded, m_vecdata) + alloc * sizeof (T); }