Backport r248489

2017-06-22  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-05-26  Martin Liska  <mliska@suse.cz>

	PR ipa/80663
	* params.def: Bound partial-inlining-entry-probability param.
2017-06-22  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2017-05-26  Martin Liska  <mliska@suse.cz>

	PR ipa/80663
	* g++.dg/ipa/pr80212.C: Remove the test as it does not longer
	split at the problematic spot.
	* gcc.dg/ipa/pr48195.c: Change 101 to 100 as 101 is no longer
	a valid value of the param.

From-SVN: r249536

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5f67c7719a3b2ccf96259834fa1ef983c69753c6..d572268b63fcb1b6d62bedd21af57c3656645844 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-06-22  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-05-26  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/80663
+       * params.def: Bound partial-inlining-entry-probability param.
+
 2017-06-22  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/params.def b/gcc/params.def
index 33d637675ab89d9ca3545ba0d4af6262a90ba44f..1995f1435f6ae27eadfce73d3805c3145ea6b168 100644 (file)
--- a/gcc/params.def
+++ b/gcc/params.def
@@ -121,7 +121,7 @@ DEFPARAM (PARAM_COMDAT_SHARING_PROBABILITY,
 DEFPARAM (PARAM_PARTIAL_INLINING_ENTRY_PROBABILITY,
          "partial-inlining-entry-probability",
          "Maximum probability of the entry BB of split region (in percent relative to entry BB of the function) to make partial inlining happen",
-         70, 0, 0)
+         70, 0, 100)
 
 /* Limit the number of expansions created by the variable expansion
    optimization to avoid register pressure.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 20f998d37e967ff1fbf6c228f7dad998829d0272..b411b9dbc108f12bd1931f57d3f4c1f315161ca0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2017-06-22  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2017-05-26  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/80663
+       * g++.dg/ipa/pr80212.C: Remove the test as it does not longer
+       split at the problematic spot.
+       * gcc.dg/ipa/pr48195.c: Change 101 to 100 as 101 is no longer
+       a valid value of the param.
+
 2017-06-09  Janus Weil  <janus@gcc.gnu.org>
 
        Backport from trunk

diff --git a/gcc/testsuite/g++.dg/ipa/pr80212.C b/gcc/testsuite/g++.dg/ipa/pr80212.C
deleted file mode 100644 (file)
index 60d3b61..0000000
--- a/gcc/testsuite/g++.dg/ipa/pr80212.C
+++ /dev/null
@@ -1,18 +0,0 @@
-// PR ipa/80212
-// { dg-options "-O2 --param partial-inlining-entry-probability=403796683 -fno-early-inlining" }
-
-struct b
-{
-  virtual b *c () const;
-};
-struct d : virtual b
-{
-};
-struct e : d
-{
-  e *
-  c () const
-  {
-  }
-};
-main () { e a; }

diff --git a/gcc/testsuite/gcc.dg/ipa/pr48195.c b/gcc/testsuite/gcc.dg/ipa/pr48195.c
index 2e38452d59880ab578ca131a762a75bf7deb05b5..25e80bab8f8b60b709ebde1aaa762185163cd87e 100644 (file)
--- a/gcc/testsuite/gcc.dg/ipa/pr48195.c
+++ b/gcc/testsuite/gcc.dg/ipa/pr48195.c
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "-O2 -flto --param partial-inlining-entry-probability=101" } */
+/* { dg-options "-O2 -flto --param partial-inlining-entry-probability=100" } */
 /* { dg-require-effective-target lto } */
 
 extern void abort(void);