diff options
| author | Philip Herron <philip.herron@embecosm.com> | 2022-08-23 14:29:23 +0100 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2022-08-23 14:31:03 +0100 |
| commit | 57f0c9d6464c95807e836844f3013ed67948a16e (patch) | |
| tree | 2a6b2ddf4fb364ebbc3699bcede6f40466f80aaa /gcc/ggc-common.cc | |
| parent | 8d1a6deb4e69e7dc162e741377674cf03459bcd9 (diff) | |
| parent | baa3ffb19c54fa334ac2884f6acb5d31aa79ac32 (diff) | |
| download | gcc-57f0c9d6464c95807e836844f3013ed67948a16e.zip gcc-57f0c9d6464c95807e836844f3013ed67948a16e.tar.gz gcc-57f0c9d6464c95807e836844f3013ed67948a16e.tar.bz2 | |
Merge remote-tracking branch 'gcc/master' into phil/gcc-upstream-merge
This merges GCC as of baa3ffb19c54fa334ac2884f6acb5d31aa79ac32 into gccrs
Diffstat (limited to 'gcc/ggc-common.cc')
| -rw-r--r-- | gcc/ggc-common.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ggc-common.cc b/gcc/ggc-common.cc index 755d166..8b3389e 100644 --- a/gcc/ggc-common.cc +++ b/gcc/ggc-common.cc @@ -175,8 +175,8 @@ ggc_cleared_alloc_htab_ignore_args (size_t c ATTRIBUTE_UNUSED, void * ggc_cleared_alloc_ptr_array_two_args (size_t c, size_t n) { - gcc_assert (sizeof (PTR *) == n); - return ggc_cleared_vec_alloc<PTR *> (c); + gcc_assert (sizeof (void **) == n); + return ggc_cleared_vec_alloc<void **> (c); } /* These are for splay_tree_new_ggc. */ @@ -592,7 +592,7 @@ gt_pch_save (FILE *f) temporarily defined and then restoring previous state. */ int get_vbits = 0; size_t valid_size = state.ptrs[i]->size; - if (__builtin_expect (RUNNING_ON_VALGRIND, 0)) + if (UNLIKELY (RUNNING_ON_VALGRIND)) { if (vbits.length () < valid_size) vbits.safe_grow (valid_size, true); @@ -644,7 +644,7 @@ gt_pch_save (FILE *f) if (state.ptrs[i]->note_ptr_fn != gt_pch_p_S) memcpy (state.ptrs[i]->obj, this_object, state.ptrs[i]->size); #if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS - if (__builtin_expect (get_vbits == 1, 0)) + if (UNLIKELY (get_vbits == 1)) { (void) VALGRIND_SET_VBITS (state.ptrs[i]->obj, vbits.address (), valid_size); |