[gcc-6] 185/401: Replace proposed fix for PR ipa/68273 by the corresponding patch taken from trunk.

Ximin Luo infinity0 at debian.org
Wed Apr 5 15:49:04 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit aa2d1b49c02b1962df14dba405f505765f6f5357
Author: aurel32 <aurel32 at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Aug 10 12:08:12 2016 +0000

    Replace proposed fix for PR ipa/68273 by the corresponding patch taken
    from trunk.
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8947 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                     |  5 ++++
 debian/patches/pr68273-proposed.diff | 52 ------------------------------------
 debian/patches/pr68273.diff          | 18 +++++++++++++
 debian/rules.patch                   |  8 +-----
 4 files changed, 24 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ae34e4..682c6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 gcc-6 (6.1.1-12) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Update to SVN 20160805 (r239167, 6.1.1) from the gcc-6-branch.
     Fix PR target/71869 (PPC), PR target/72805 (x86), PR target/70677 (AVR),
     PR c++/72415.
@@ -7,6 +8,10 @@ gcc-6 (6.1.1-12) UNRELEASED; urgency=medium
   * Fix running the libjava testsuite.
   * Revert fix for PR target/55947, causing PR libstdc++/72813. LP: #1610220.
 
+  [ Aurelien Jarno ]
+  * Replace proposed fix for PR ipa/68273 by the corresponding patch taken
+    from trunk.
+
  -- Matthias Klose <doko at debian.org>  Fri, 05 Aug 2016 15:06:19 +0200
 
 gcc-6 (6.1.1-11) unstable; urgency=medium
diff --git a/debian/patches/pr68273-proposed.diff b/debian/patches/pr68273-proposed.diff
deleted file mode 100644
index 3b68a0a..0000000
--- a/debian/patches/pr68273-proposed.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Richard Biener 2016-02-15 10:05:13 UTC
-
-eipa_sra introduces the remaining SSA name with non-default alignment via
-
-#0  make_ssa_name_fn (fn=0x7ffff68bb5e8, 
-    var=<parm_decl 0x7ffff69bc700 ISRA.81>, stmt=<gimple_nop 0x7ffff68bcf50>)
-    at /space/rguenther/src/svn/trunk3/gcc/tree-ssanames.c:311
-#1  0x0000000000e203d1 in get_or_create_ssa_default_def (fn=0x7ffff68bb5e8, 
-    var=<parm_decl 0x7ffff69bc700 ISRA.81>)
-    at /space/rguenther/src/svn/trunk3/gcc/tree-dfa.c:360
-#2  0x0000000000e6638e in get_reaching_def (
-    var=<parm_decl 0x7ffff69bc700 ISRA.81>)
-    at /space/rguenther/src/svn/trunk3/gcc/tree-into-ssa.c:1168
-#3  0x0000000000e67855 in maybe_replace_use (use_p=0x7ffff6a17810)
-    at /space/rguenther/src/svn/trunk3/gcc/tree-into-ssa.c:1753
-#4  0x0000000000e67eb9 in rewrite_update_stmt (
-    stmt=<gimple_assign 0x7ffff6966f50>, gsi=...)
-    at /space/rguenther/src/svn/trunk3/gcc/tree-into-ssa.c:1950
-#5  0x0000000000e685f4 in rewrite_update_dom_walker::before_dom_children (
-    this=0x7fffffffd580, bb=<basic_block 0x7ffff6491f08 (2)>)
-    at /space/rguenther/src/svn/trunk3/gcc/tree-into-ssa.c:2130
-#6  0x00000000013e0993 in dom_walker::walk (this=0x7fffffffd580, 
-    bb=<basic_block 0x7ffff6491f08 (2)>)
-    at /space/rguenther/src/svn/trunk3/gcc/domwalk.c:265
-
-thus SSA rewrite.  ISRA.81 is a PARM_DECL built in ipa_modify_formal_parameters
-from an access present in the IL created by early SRA.
-
----
- src/gcc/tree-sra.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/gcc/tree-sra.c
-+++ b/src/gcc/tree-sra.c
-@@ -933,7 +933,7 @@
- 
-   access = create_access_1 (base, offset, size);
-   access->expr = expr;
--  access->type = TREE_TYPE (expr);
-+  access->type = TYPE_MAIN_VARIANT (TREE_TYPE (expr));
-   access->write = write;
-   access->grp_unscalarizable_region = unscalarizable_region;
-   access->stmt = stmt;
-@@ -1108,7 +1108,7 @@
- 
-   access = create_access_1 (var, 0, size);
-   access->expr = var;
--  access->type = TREE_TYPE (var);
-+  access->type = TYPE_MAIN_VARIANT (TREE_TYPE (var));
-   access->grp_total_scalarization = 1;
- }
- 
diff --git a/debian/patches/pr68273.diff b/debian/patches/pr68273.diff
new file mode 100644
index 0000000..2aed63b
--- /dev/null
+++ b/debian/patches/pr68273.diff
@@ -0,0 +1,18 @@
+2016-08-09  Richard Biener  <rguenther at suse.de>
+
+	PR ipa/68273
+	* ipa-prop.c (ipa_modify_formal_parameters): Build
+	parameter types with natural alignment also for the
+	over-aligned case.
+
+--- a/src/gcc/ipa-prop.c
++++ b/src/gcc/ipa-prop.c
+@@ -3910,7 +3910,7 @@ ipa_modify_formal_parameters (tree fndecl, ipa_parm_adjustment_vec adjustments)
+ 	      if (is_gimple_reg_type (ptype))
+ 		{
+ 		  unsigned malign = GET_MODE_ALIGNMENT (TYPE_MODE (ptype));
+-		  if (TYPE_ALIGN (ptype) < malign)
++		  if (TYPE_ALIGN (ptype) != malign)
+ 		    ptype = build_aligned_type (ptype, malign);
+ 		}
+ 	    }
diff --git a/debian/rules.patch b/debian/rules.patch
index 4876a70..605e082 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -90,19 +90,13 @@ debian_patches += \
 	vulcan-costs \
 	libjava-mips64el \
 	PR55947-revert \
+	pr68273 \
 
 # this is still needed on powerpc, e.g. firefox and insighttoolkit4 will ftbfs.
 ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc))
   debian_patches += pr65913-workaround
 endif
 
-# this is needed on mips 32-bit to fix GCC generating wrong function calls.
-# people do not agree yet where that should be fixed, so only apply the
-# proposed patch on mips and mipsel.
-ifneq (,$(filter $(DEB_TARGET_ARCH),mips mipsel))
-  debian_patches += pr68273-proposed
-endif
-
 ifeq ($(libstdcxx_abi),new)
   debian_patches += libstdc++-functexcept
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git



More information about the Reproducible-commits mailing list