std:vec for classes with constructor?

Aldy Hernandez aldyh@redhat.com
Mon Aug 10 13:05:26 GMT 2020


For the record.  The final patch (below) passes tests on ppc64le for 
both trunk, and the ranger-staging branch with ranger enabled.

Aldy

gcc/ChangeLog:

	* ipa-fnsummary.c (evaluate_conditions_for_known_args):
	(evaluate_properties_for_edge):
	(ipa_fn_summary_t::duplicate):
	(estimate_ipcp_clone_size_and_time):
	* vec.h (vl_embed>::embedded_size):
---
  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<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 +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<value_range> known_value_ranges (32);
+  auto_vec<value_range, 32> 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<value_range> (),
+					  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<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..db48e979d77 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);
  }

-- 
2.26.2



More information about the Gcc-patches mailing list