diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-08-24 16:50:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 16:50:14 +0000 |
| commit | d3cf195ab46d7effe806990aa6b7a409bf8e46df (patch) | |
| tree | eb33d22a749417ad62a3fc87c2dc8cfb3452632a /gcc/ggc-common.cc | |
| parent | 825a44b40ce6cfa76470e53d0746b1e64b99ee5b (diff) | |
| parent | 2e77960b14527ff216fa188479de9142fbb9d34c (diff) | |
| download | gcc-d3cf195ab46d7effe806990aa6b7a409bf8e46df.zip gcc-d3cf195ab46d7effe806990aa6b7a409bf8e46df.tar.gz gcc-d3cf195ab46d7effe806990aa6b7a409bf8e46df.tar.bz2 | |
Merge #1498
1498: Merge from GCC upstream r=philberty a=philberty
Lets see if it builds.
Co-authored-by: GCC Administrator <gccadmin@gcc.gnu.org>
Co-authored-by: Dimitrije Milošević <dimitrije.milosevic@syrmia.com>
Co-authored-by: Aldy Hernandez <aldyh@redhat.com>
Co-authored-by: Jakub Jelinek <jakub@redhat.com>
Co-authored-by: Martin Liska <mliska@suse.cz>
Co-authored-by: Roger Sayle <roger@nextmovesoftware.com>
Co-authored-by: Sam Feifer <sfeifer@redhat.com>
Co-authored-by: Andrew Stubbs <ams@codesourcery.com>
Co-authored-by: Jose E. Marchesi <jose.marchesi@oracle.com>
Co-authored-by: H.J. Lu <hjl.tools@gmail.com>
Co-authored-by: David Malcolm <dmalcolm@redhat.com>
Co-authored-by: Richard Biener <rguenther@suse.de>
Co-authored-by: Immad Mir <mirimmad@outlook.com>
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); |