From: hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 28 Mar 2013 23:31:58 +0000 (+0000)
Subject: 	* lto-cgraph.c (merge_profile_summaries): Fix overflows.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed8b1c1fb76eb2f437317827d85db51ac176f4cd;p=thirdparty%2Fgcc.git

	* lto-cgraph.c (merge_profile_summaries): Fix overflows.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 858d96ebd98d..67d1184f21a0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-28  Jan Hubicka  <jh@suse.cz>
+
+	* lto-cgraph.c (merge_profile_summaries): Fix overflows.
+
 2013-03-28  Ian Bolton  <ian.bolton@arm.com>
 
 	* config/aarch64/aarch64.md (aarch64_can_eliminate): Keep frame
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index d9d798a2ade3..6d639a9459d2 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -1362,8 +1362,8 @@ merge_profile_summaries (struct lto_file_decl_data **file_data_vec)
     {
       /* Scale up the min value as we did the corresponding sum_all
          above. Use that to find the new histogram index.  */
-      int scaled_min = RDIV (saved_profile_info->histogram[h_ix].min_value
-                             * saved_scale, REG_BR_PROB_BASE);
+      gcov_type scaled_min = RDIV (saved_profile_info->histogram[h_ix].min_value
+                                   * saved_scale, REG_BR_PROB_BASE);
       /* The new index may be shared with another scaled histogram entry,
          so we need to account for a non-zero histogram entry at new_ix.  */
       unsigned new_ix = gcov_histo_index (scaled_min);