From: Trevor Saunders <tsaunders@mozilla.com>
Date: Fri, 12 Sep 2014 12:30:29 +0000 (+0000)
Subject: fix assert in hash_table pch routines
X-Git-Tag: releases/gcc-5.1.0~4658
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b49af15353fcc066ec8c8049f568d7c1da0401f;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0486724f02d..5b27aa80e01d 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 c2a68fd23a2b..028b7dec3df0 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])