Is the attached patch what y'all suggest?
The patch reverts the GCC vec<> usage in ipa-fnsummary.c and
implements the above suggestion.
Bootstraps, tests running...
If tests pass, is this OK?
Thanks.
Aldy
On Fri, Aug 7, 2020 at 11:17 AM Jonathan Wakely via Gcc-patches
<[email protected]> wrote:
>
> On 07/08/20 10:55 +0200, Jakub Jelinek wrote:
> >On Fri, Aug 07, 2020 at 09:34:38AM +0100, Jonathan Wakely via Gcc-patches
> >wrote:
> >> > Now that you say it, vec has a T[1] member so depending on T
> >> > there might be a side-effect as invoking its CTOR? Or it might
> >> > even not compile if there is no default CTOR available... Ick :/
> >>
> >> Right.
> >>
> >> Does the GTY stuff add members to the struct, or otherwise alter its
> >> layout?
> >
> >Or perhaps use offsetof on an alternate structure that should have the same
> >layout.
>
> Yes that's what I was going to suggest next.
>
> >So instead of
> > typedef vec<T, A, vl_embed> vec_embedded;
> > return offsetof (vec_embedded, m_vecdata) + alloc * sizeof (T);
> >use
> > struct alignas (T) U { char data[sizeof (T)]; };
> > typedef vec<U, A, vl_embed> 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);
> >where vec_embedded should have the same offset of m_vecdata as vec.
>
diff --git a/gcc/ipa-fnsummary.c b/gcc/ipa-fnsummary.c
index 49bab04524b..d853ed8f075 100644
--- a/gcc/ipa-fnsummary.c
+++ b/gcc/ipa-fnsummary.c
@@ -82,7 +82,6 @@ along with GCC; see the file COPYING3. If not see
#include "gimplify.h"
#include "stringpool.h"
#include "attribs.h"
-#include <vector>
#include "tree-into-ssa.h"
/* Summaries. */
@@ -331,7 +330,7 @@ static void
evaluate_conditions_for_known_args (struct cgraph_node *node,
bool inline_p,
vec<tree> known_vals,
- const std::vector<value_range> &known_value_ranges,
+ vec<value_range> known_value_ranges,
vec<ipa_agg_value_set> known_aggs,
clause_t *ret_clause,
clause_t *ret_nonspec_clause)
@@ -446,7 +445,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 +554,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<value_range> known_value_ranges (32);
+ auto_vec<value_range, 32> known_value_ranges;
class ipa_edge_args *args;
if (clause_ptr)
@@ -630,11 +629,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 +807,7 @@ ipa_fn_summary_t::duplicate (cgraph_node *src,
}
evaluate_conditions_for_known_args (dst, false,
known_vals,
- std::vector<value_range> (),
+ vNULL,
vNULL,
&possible_truths,
/* We are going to specialize,
@@ -3692,8 +3691,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<value_range> (),
+ 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..01d7736c520 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -1281,7 +1281,10 @@ template<typename T, typename A>
inline size_t
vec<T, A, vl_embed>::embedded_size (unsigned alloc)
{
- typedef vec<T, A, vl_embed> vec_embedded;
+ struct alignas (T) U { char data[sizeof (T)]; };
+ typedef vec<U, A, vl_embed> 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);
}
