diff options
| author | Matthias Kretz <m.kretz@gsi.de> | 2021-12-03 09:37:52 +0100 |
|---|---|---|
| committer | Matthias Kretz <m.kretz@gsi.de> | 2021-12-07 13:11:47 +0100 |
| commit | c93e704b9e0411f1db031df9716b9958307590e3 (patch) | |
| tree | f0ca7198448457490849aedbdfc5513acc84ec20 | |
| parent | ba6bb287f03d42ab6c4f39ce99dcf94ec5113655 (diff) | |
| download | gcc-c93e704b9e0411f1db031df9716b9958307590e3.zip gcc-c93e704b9e0411f1db031df9716b9958307590e3.tar.gz gcc-c93e704b9e0411f1db031df9716b9958307590e3.tar.bz2 | |
Fix hash_map::traverse overload
The hash_map::traverse overload taking a non-const Value pointer breaks
if the callback returns false. The other overload should behave the
same.
Signed-off-by: Matthias Kretz <m.kretz@gsi.de>
gcc/ChangeLog:
* hash-map.h (hash_map::traverse): Let both overloads behave the
same.
* predict.c (assert_is_empty): Return true, thus not changing
behavior.
| -rw-r--r-- | gcc/hash-map.h | 6 | ||||
| -rw-r--r-- | gcc/predict.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/hash-map.h b/gcc/hash-map.h index dd039f1..c4fe26c 100644 --- a/gcc/hash-map.h +++ b/gcc/hash-map.h @@ -217,7 +217,8 @@ public: } /* Call the call back on each pair of key and value with the passed in - arg. */ + arg until either the call back returns false or all pairs have been seen. + The traversal is unordered. */ template<typename Arg, bool (*f)(const typename Traits::key_type &, const Value &, Arg)> @@ -225,7 +226,8 @@ public: { for (typename hash_table<hash_entry>::iterator iter = m_table.begin (); iter != m_table.end (); ++iter) - f ((*iter).m_key, (*iter).m_value, a); + if (!f ((*iter).m_key, (*iter).m_value, a)) + break; } template<typename Arg, bool (*f)(const typename Traits::key_type &, diff --git a/gcc/predict.c b/gcc/predict.c index 3cb4e3c..1a1da7e 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -3044,7 +3044,7 @@ assert_is_empty (const_basic_block const &, edge_prediction *const &value, void *) { gcc_assert (!value); - return false; + return true; } /* Predict branch probabilities and estimate profile for basic block BB. |