diff options
| author | Dehao Chen <dehao@google.com> | 2013-09-26 16:54:37 +0000 |
|---|---|---|
| committer | Dehao Chen <dehao@google.com> | 2013-09-26 16:54:37 +0000 |
| commit | d9233929a85bd116f6f7ae2bdcf4a87b4f5ae5d0 (patch) | |
| tree | c05a1f0a2e68ca5903a5534624825436cb07949d | |
| parent | 94be998dd2ba5e76f46a2417c7d845f69d9199bb (diff) | |
1. Fix an ICE when lipo_cmp_type handles NULL_PTR_TYPE.google/gcc-4_7
2. Fix the bug when AutoFDO honors max-lipo-group parameter.
2013-09-26 Dehao Chen <dehao@google.com>
* gcc/l-ipo.c (lipo_cmp_type): Handle NULL_PTR_TYPE correctly.
* gcc/auto-profile.c (read_aux_modules): Handle max-lipo-group.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/gcc-4_7@202953 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/auto-profile.c | 2 | ||||
| -rw-r--r-- | gcc/l-ipo.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gcc/auto-profile.c b/gcc/auto-profile.c index bfdd54a65ff..a08efc0846d 100644 --- a/gcc/auto-profile.c +++ b/gcc/auto-profile.c @@ -531,7 +531,7 @@ read_aux_modules (void) "assembler statements", aux_entry->name); continue; } - if (max_group != 0 && curr_module == max_group) + if (max_group != 0 && curr_module >= max_group) { if (flag_opt_info) inform (0, "Not importing %s: maximum group size reached", diff --git a/gcc/l-ipo.c b/gcc/l-ipo.c index 14fa25bbaa9..2cd33326f0c 100644 --- a/gcc/l-ipo.c +++ b/gcc/l-ipo.c @@ -709,6 +709,7 @@ lipo_cmp_type (tree t1, tree t2) && lipo_cmp_type (TREE_TYPE (t1), TREE_TYPE (t2))); case VOID_TYPE: case BOOLEAN_TYPE: + case NULLPTR_TYPE: return 1; case TEMPLATE_TYPE_PARM: return 1; |