From: Diego Novillo <dnovillo@google.com>
Date: Thu, 13 Oct 2011 18:25:10 +0000 (-0400)
Subject: class.c (sorted_fields_type_new): Factor out of ...
X-Git-Tag: releases/gcc-4.7.0~3140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=385b73ab1dd53d3815d929792166e07cc37f969f;p=thirdparty%2Fgcc.git

class.c (sorted_fields_type_new): Factor out of ...

	* class.c (sorted_fields_type_new): Factor out of ...
	(finish_struct_1): ... here.

From-SVN: r179939
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e70f5c8490fa..18c98bb3f353 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-13   Diego Novillo  <dnovillo@google.com>
+
+	* class.c (sorted_fields_type_new): Factor out of ...
+	(finish_struct_1): ... here.
+
 2011-10-13  Jason Merrill  <jason@redhat.com>
 
 	PR c++/50618
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 2df9177e47ed..61850543b547 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5663,6 +5663,22 @@ determine_key_method (tree type)
   return;
 }
 
+
+/* Allocate and return an instance of struct sorted_fields_type with
+   N fields.  */
+
+static struct sorted_fields_type *
+sorted_fields_type_new (int n)
+{
+  struct sorted_fields_type *sft;
+  sft = ggc_alloc_sorted_fields_type (sizeof (struct sorted_fields_type)
+				      + n * sizeof (tree));
+  sft->len = n;
+
+  return sft;
+}
+
+
 /* Perform processing required when the definition of T (a class type)
    is complete.  */
 
@@ -5792,9 +5808,7 @@ finish_struct_1 (tree t)
   n_fields = count_fields (TYPE_FIELDS (t));
   if (n_fields > 7)
     {
-      struct sorted_fields_type *field_vec = ggc_alloc_sorted_fields_type
-	 (sizeof (struct sorted_fields_type) + n_fields * sizeof (tree));
-      field_vec->len = n_fields;
+      struct sorted_fields_type *field_vec = sorted_fields_type_new (n_fields);
       add_fields_to_record_type (TYPE_FIELDS (t), field_vec, 0);
       qsort (field_vec->elts, n_fields, sizeof (tree),
 	     field_decl_cmp);