Backport r257939

2018-03-07  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2018-02-08  Jan Hubicka  <hubicka@ucw.cz>

	* lto-partition.c (lto_balanced_map): Watch overflow.

From-SVN: r258325

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 37ab17b4ffc69df89e0da274e54ddd1c509dfbdf..2d016a96ea1a0144a3488c74a087639d7a9b194f 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-07  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2018-02-08  Jan Hubicka  <hubicka@ucw.cz>
+
+       * lto-partition.c (lto_balanced_map): Watch overflow.
+
 2018-03-07  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c
index 051b98771fcb9b5e7b4385129c46f970f3cf65fe..cffec8e4bcf68d5caca0b02ebb8fb622994518f3 100644 (file)
--- a/gcc/lto/lto-partition.c
+++ b/gcc/lto/lto-partition.c
@@ -751,7 +751,8 @@ lto_balanced_map (int n_lto_partitions)
          if (npartitions < n_lto_partitions)
            partition_size = total_size / (n_lto_partitions - npartitions);
          else
-           partition_size = INT_MAX;
+           /* Watch for overflow.  */
+           partition_size = INT_MAX / 16;
 
          if (partition_size < PARAM_VALUE (MIN_PARTITION_SIZE))
            partition_size = PARAM_VALUE (MIN_PARTITION_SIZE);