aboutsummaryrefslogtreecommitdiff
path: root/gcc/vec.h
diff options
context:
space:
mode:
authorRichard Sandiford <richard.sandiford@arm.com>2023-06-29 08:48:17 +0100
committerRichard Sandiford <richard.sandiford@arm.com>2023-06-29 08:48:17 +0100
commit4e9f6c14280699997a633cefd3fb315b2bd4762c (patch)
tree4e79f2ca94117cdc41a30d6ef965ffbdc0505958 /gcc/vec.h
parente714af12e3bee0032d8d226f87d92c9bc46f0269 (diff)
downloadgcc-4e9f6c14280699997a633cefd3fb315b2bd4762c.zip
gcc-4e9f6c14280699997a633cefd3fb315b2bd4762c.tar.gz
gcc-4e9f6c14280699997a633cefd3fb315b2bd4762c.tar.bz2
A couple of va_gc_atomic tweaks
The only current user of va_gc_atomic is Ada's: vec<Entity_Id, va_gc_atomic> It uses the generic gt_pch_nx routines (with gt_pch_nx being the “note pointers” hooks), such as: template<typename T, typename A> void gt_pch_nx (vec<T, A, vl_embed> *v) { extern void gt_pch_nx (T &); for (unsigned i = 0; i < v->length (); i++) gt_pch_nx ((*v)[i]); } It then defines gt_pch_nx routines for Entity_Id &. The problem is that if we wanted to take the same approach for an array of unsigned ints, we'd need to define: inline void gt_pch_nx (unsigned int &) { } which would then be ambiguous with: inline void gt_pch_nx (unsigned int) { } The point of va_gc_atomic is that the elements don't need to be GCed, and so we have: template<typename T> void gt_ggc_mx (vec<T, va_gc_atomic, vl_embed> *v ATTRIBUTE_UNUSED) { /* Nothing to do. Vectors of atomic types wrt GC do not need to be traversed. */ } I think it's therefore reasonable to assume that no pointers will need to be processed for PCH either. The patch also relaxes the array_slice constructor for vec<T, va_gc> * so that it handles all embedded vectors. gcc/ * vec.h (gt_pch_nx): Add overloads for va_gc_atomic. (array_slice): Relax va_gc constructor to handle all vectors with a vl_embed layout. gcc/ada/ * gcc-interface/decl.cc (gt_pch_nx): Remove overloads for Entity_Id.
Diffstat (limited to 'gcc/vec.h')
-rw-r--r--gcc/vec.h22
1 files changed, 18 insertions, 4 deletions
diff --git a/gcc/vec.h b/gcc/vec.h
index 3691891..6f7b048 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -1390,6 +1390,13 @@ gt_pch_nx (vec<T, A, vl_embed> *v)
gt_pch_nx ((*v)[i]);
}
+template<typename T>
+void
+gt_pch_nx (vec<T, va_gc_atomic, vl_embed> *)
+{
+ /* No pointers to note. */
+}
+
template<typename T, typename A>
void
gt_pch_nx (vec<T *, A, vl_embed> *v, gt_pointer_operator op, void *cookie)
@@ -1407,6 +1414,13 @@ gt_pch_nx (vec<T, A, vl_embed> *v, gt_pointer_operator op, void *cookie)
gt_pch_nx (&((*v)[i]), op, cookie);
}
+template<typename T>
+void
+gt_pch_nx (vec<T, va_gc_atomic, vl_embed> *, gt_pointer_operator, void *)
+{
+ /* No pointers to note. */
+}
+
/* Space efficient vector. These vectors can grow dynamically and are
allocated together with their control data. They are suited to be
@@ -2286,12 +2300,12 @@ public:
array_slice (vec<OtherT> &v)
: m_base (v.address ()), m_size (v.length ()) {}
- template<typename OtherT>
- array_slice (const vec<OtherT, va_gc> *v)
+ template<typename OtherT, typename A>
+ array_slice (const vec<OtherT, A, vl_embed> *v)
: m_base (v ? v->address () : nullptr), m_size (v ? v->length () : 0) {}
- template<typename OtherT>
- array_slice (vec<OtherT, va_gc> *v)
+ template<typename OtherT, typename A>
+ array_slice (vec<OtherT, A, vl_embed> *v)
: m_base (v ? v->address () : nullptr), m_size (v ? v->length () : 0) {}
iterator begin () { return m_base; }