diff options
| author | Trevor Saunders <tsaunders@mozilla.com> | 2014-09-12 12:30:29 +0000 |
|---|---|---|
| committer | Trevor Saunders <tbsaunde@gcc.gnu.org> | 2014-09-12 12:30:29 +0000 |
| commit | 4b49af15353fcc066ec8c8049f568d7c1da0401f (patch) | |
| tree | a8e9ce8faef9515631fc7ce85e5da6c406e57bb1 | |
| parent | 8cc4b7a26dc6a99a3c0a232a583917ab0100b731 (diff) | |
| download | gcc-4b49af15353fcc066ec8c8049f568d7c1da0401f.zip gcc-4b49af15353fcc066ec8c8049f568d7c1da0401f.tar.gz gcc-4b49af15353fcc066ec8c8049f568d7c1da0401f.tar.bz2 | |
fix assert in hash_table pch routines
gcc/ChangeLog:
2014-09-12 Trevor Saunders <tsaunders@mozilla.com>
* hash-table.h (gt_pch_nx): don't call gt_pch_note_object within an
assert.
From-SVN: r215216
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/hash-table.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c048672..5b27aa8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-09-12 Trevor Saunders <tsaunders@mozilla.com> + + * hash-table.h (gt_pch_nx): don't call gt_pch_note_object within an + assert. + 2014-09-12 Joseph Myers <joseph@codesourcery.com> * target.def (libgcc_floating_mode_supported_p): New hook. diff --git a/gcc/hash-table.h b/gcc/hash-table.h index c2a68fd..028b7de 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -1598,8 +1598,9 @@ template<typename D> static void gt_pch_nx (hash_table<D> *h) { - gcc_checking_assert (gt_pch_note_object (h->m_entries, h, - hashtab_entry_note_pointers<D>)); + bool success ATTRIBUTE_UNUSED + = gt_pch_note_object (h->m_entries, h, hashtab_entry_note_pointers<D>); + gcc_checking_assert (success); for (size_t i = 0; i < h->m_size; i++) { if (hash_table<D>::is_empty (h->m_entries[i]) |