From: Martin Liska <mliska@suse.cz>
Date: Wed, 7 Mar 2018 09:46:21 +0000 (+0100)
Subject: Backport r257939
X-Git-Tag: releases/gcc-6.5.0~472
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=409b5381b4b1d6dab4edc41da4539c757e863c3e;p=thirdparty%2Fgcc.git

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 37ab17b4ffc6..2d016a96ea1a 100644
--- 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 051b98771fcb..cffec8e4bcf6 100644
--- 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);