diff options
| author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
| commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
| tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/gcc/cfg.c | |
| parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
| download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip | |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/gcc/cfg.c')
| -rw-r--r-- | gcc-4.9/gcc/cfg.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gcc-4.9/gcc/cfg.c b/gcc-4.9/gcc/cfg.c index a281c0fb8..178c37794 100644 --- a/gcc-4.9/gcc/cfg.c +++ b/gcc-4.9/gcc/cfg.c @@ -941,7 +941,7 @@ scale_bbs_frequencies_int (basic_block *bbs, int nbbs, int num, int den) if (num > 1000000) return; - num = RDIV (1000 * num, den); + num = RDIV (1000.0 * num, den); den = 1000; } if (num > 100 * den) @@ -954,9 +954,9 @@ scale_bbs_frequencies_int (basic_block *bbs, int nbbs, int num, int den) /* Make sure the frequencies do not grow over BB_FREQ_MAX. */ if (bbs[i]->frequency > BB_FREQ_MAX) bbs[i]->frequency = BB_FREQ_MAX; - bbs[i]->count = RDIV (bbs[i]->count * num, den); + bbs[i]->count = RDIV ((double)bbs[i]->count * num, den); FOR_EACH_EDGE (e, ei, bbs[i]->succs) - e->count = RDIV (e->count * num, den); + e->count = RDIV ((double)e->count * num, den); } } @@ -973,7 +973,7 @@ scale_bbs_frequencies_gcov_type (basic_block *bbs, int nbbs, gcov_type num, { int i; edge e; - gcov_type fraction = RDIV (num * 65536, den); + gcov_type fraction = RDIV (num * 65536.0, den); gcc_assert (fraction >= 0); @@ -983,14 +983,14 @@ scale_bbs_frequencies_gcov_type (basic_block *bbs, int nbbs, gcov_type num, edge_iterator ei; bbs[i]->frequency = RDIV (bbs[i]->frequency * num, den); if (bbs[i]->count <= MAX_SAFE_MULTIPLIER) - bbs[i]->count = RDIV (bbs[i]->count * num, den); + bbs[i]->count = RDIV ((double)bbs[i]->count * num, den); else - bbs[i]->count = RDIV (bbs[i]->count * fraction, 65536); + bbs[i]->count = RDIV ((double)bbs[i]->count * fraction, 65536); FOR_EACH_EDGE (e, ei, bbs[i]->succs) if (bbs[i]->count <= MAX_SAFE_MULTIPLIER) - e->count = RDIV (e->count * num, den); + e->count = RDIV ((double)e->count * num, den); else - e->count = RDIV (e->count * fraction, 65536); + e->count = RDIV ((double)e->count * fraction, 65536); } else for (i = 0; i < nbbs; i++) @@ -1000,9 +1000,9 @@ scale_bbs_frequencies_gcov_type (basic_block *bbs, int nbbs, gcov_type num, bbs[i]->frequency = RDIV (bbs[i]->frequency * num, den); else bbs[i]->frequency = RDIV (bbs[i]->frequency * fraction, 65536); - bbs[i]->count = RDIV (bbs[i]->count * fraction, 65536); + bbs[i]->count = RDIV ((double)bbs[i]->count * fraction, 65536); FOR_EACH_EDGE (e, ei, bbs[i]->succs) - e->count = RDIV (e->count * fraction, 65536); + e->count = RDIV ((double)e->count * fraction, 65536); } } |