Refactor completely_scalarize_var

	* tree-sra.c (completely_scalarize_var): Rename to...
	(create_total_scalarization_access): ... Here. Drop call to
	completely_scalarize_record.

	(analyze_all_variable_accesses): Replace completely_scalarize_var
	with create_total_scalarization_access and completely_scalarize_record.

From-SVN: r227264

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 367a289b68a91a8c53e310703eb08efb116dffb9..d29d8e0cc5814c1c459834b6867423b2d93ae659 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2015-08-27  Alan Lawrence  <alan.lawrence@arm.com>
+
+       * tree-sra.c (completely_scalarize_var): Rename to...
+       (create_total_scalarization_access): ... Here. Drop call to
+       completely_scalarize_record.
+
+       (analyze_all_variable_accesses): Replace completely_scalarize_var
+       with create_total_scalarization_access and completely_scalarize_record.
+
 2015-08-27  Alan Modra  <amodra@gmail.com>
 
        PR target/67356

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 818c29078557b50499341fcda7e5175ab5f2e75e..8b3a0adf7cce76ed6962b608481f6cf0550dabfa 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -980,12 +980,11 @@ completely_scalarize_record (tree base, tree decl, HOST_WIDE_INT offset,
       }
 }
 
-/* Create total_scalarization accesses for all scalar type fields in VAR and
-   for VAR as a whole.  VAR must be of a RECORD_TYPE conforming to
-   type_consists_of_records_p.   */
+/* Create a total_scalarization access for VAR as a whole.  VAR must be of a
+   RECORD_TYPE conforming to type_consists_of_records_p.  */
 
 static void
-completely_scalarize_var (tree var)
+create_total_scalarization_access (tree var)
 {
   HOST_WIDE_INT size = tree_to_uhwi (DECL_SIZE (var));
   struct access *access;
@@ -994,8 +993,6 @@ completely_scalarize_var (tree var)
   access->expr = var;
   access->type = TREE_TYPE (var);
   access->grp_total_scalarization = 1;
-
-  completely_scalarize_record (var, var, 0, var);
 }
 
 /* Return true if REF has an VIEW_CONVERT_EXPR somewhere in it.  */
@@ -2529,7 +2526,8 @@ analyze_all_variable_accesses (void)
            if (tree_to_uhwi (TYPE_SIZE (TREE_TYPE (var)))
                <= max_scalarization_size)
              {
-               completely_scalarize_var (var);
+               create_total_scalarization_access (var);
+               completely_scalarize_record (var, var, 0, var);
                if (dump_file && (dump_flags & TDF_DETAILS))
                  {
                    fprintf (dump_file, "Will attempt to totally scalarize ");