2012-03-16 Richard Guenther <rguenther@suse.de>

	PR tree-optimization/52603
	* tree-vect-data-refs.c (vect_can_force_dr_alignment_p): Clarify
	comment.

	Revert
	2012-03-14  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/52571
	* tree-vect-data-refs.c (vect_compute_data_ref_alignment): Move
	flag_section_anchors check ...
	(vect_can_force_dr_alignment_p): ... here.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185474 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d517881..9399c2d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2012-03-16  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/52603
+       * tree-vect-data-refs.c (vect_can_force_dr_alignment_p): Clarify
+       comment.
+
+       Revert
+       2012-03-14  Richard Guenther  <rguenther@suse.de>
+
+       PR tree-optimization/52571
+       * tree-vect-data-refs.c (vect_compute_data_ref_alignment): Move
+       flag_section_anchors check ...
+       (vect_can_force_dr_alignment_p): ... here.
+
 2012-03-16  Martin Jambor  <mjambor@suse.cz>
 
        * expr.c (expand_expr_real_1): handle misaligned scalar reads from

diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c
index 9b66d86..d6bfe6c 100644 (file)
--- a/gcc/tree-vect-data-refs.c
+++ b/gcc/tree-vect-data-refs.c
@@ -872,7 +872,12 @@ vect_compute_data_ref_alignment (struct data_reference *dr)
 
   if (!base_aligned)
     {
-      if (!vect_can_force_dr_alignment_p (base, TYPE_ALIGN (vectype)))
+      /* Do not change the alignment of global variables here if
+        flag_section_anchors is enabled as we already generated
+        RTL for other functions.  Most global variables should
+        have been aligned during the IPA increase_alignment pass.  */
+      if (!vect_can_force_dr_alignment_p (base, TYPE_ALIGN (vectype))
+         || (TREE_STATIC (base) && flag_section_anchors))
        {
          if (vect_print_dump_info (REPORT_DETAILS))
            {
@@ -4554,11 +4559,6 @@ vect_can_force_dr_alignment_p (const_tree decl, unsigned int alignment)
   if (TREE_ASM_WRITTEN (decl))
     return false;
 
-  /* Do not change the alignment of global variables if flag_section_anchors
-     is enabled.  */
-  if (TREE_STATIC (decl) && flag_section_anchors)
-    return false;
-
   if (TREE_STATIC (decl))
     return (alignment <= MAX_OFILE_ALIGNMENT);
   else