From: dehao <dehao@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 16 May 2014 23:01:26 +0000 (+0000)
Subject: 2014-05-16  Dehao Chen  <dehao@google.com>
X-Git-Tag: upstream/5.3.0~8402
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e604463f41238584607f7bd6582eb1d7ab92c018;p=platform%2Fupstream%2Flinaro-gcc.git

2014-05-16  Dehao Chen  <dehao@google.com>

        * ira-int.h (REG_FREQ_FROM_EDGE_FREQ): Use optimize_function_for_size_p.
        * regs.h (REG_FREQ_FROM_BB): Likewise.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2af2ef3..c04c887 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-16  Dehao Chen  <dehao@google.com>
+
+	* ira-int.h (REG_FREQ_FROM_EDGE_FREQ): Use optimize_function_for_size_p.
+	* regs.h (REG_FREQ_FROM_BB): Likewise.
+
 2014-05-16  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	PR target/51244
diff --git a/gcc/ira-int.h b/gcc/ira-int.h
index e36bb92..19d8601 100644
--- a/gcc/ira-int.h
+++ b/gcc/ira-int.h
@@ -42,9 +42,8 @@ along with GCC; see the file COPYING3.  If not see
    profile driven feedback is available and the function is never
    executed, frequency is always equivalent.  Otherwise rescale the
    edge frequency.  */
-#define REG_FREQ_FROM_EDGE_FREQ(freq)					   \
-  (optimize_size || (flag_branch_probabilities				   \
-		     && !ENTRY_BLOCK_PTR_FOR_FN (cfun)->count)		   \
+#define REG_FREQ_FROM_EDGE_FREQ(freq)				   \
+  (optimize_function_for_size_p (cfun)				   \
    ? REG_FREQ_MAX : (freq * REG_FREQ_MAX / BB_FREQ_MAX)		   \
    ? (freq * REG_FREQ_MAX / BB_FREQ_MAX) : 1)
 
diff --git a/gcc/regs.h b/gcc/regs.h
index 006caca..c8c978b 100644
--- a/gcc/regs.h
+++ b/gcc/regs.h
@@ -135,9 +135,7 @@ extern size_t reg_info_p_size;
    or profile driven feedback is available and the function is never executed,
    frequency is always equivalent.  Otherwise rescale the basic block
    frequency.  */
-#define REG_FREQ_FROM_BB(bb) (optimize_size				      \
-			      || (flag_branch_probabilities		      \
-				  && !ENTRY_BLOCK_PTR_FOR_FN (cfun)->count)   \
+#define REG_FREQ_FROM_BB(bb) (optimize_function_for_size_p (cfun)	      \
 			      ? REG_FREQ_MAX				      \
 			      : ((bb)->frequency * REG_FREQ_MAX / BB_FREQ_MAX)\
 			      ? ((bb)->frequency * REG_FREQ_MAX / BB_FREQ_MAX)\