As preparation to remove m_vecdata in the vl_embed vector this
changes references to it into calls to address ().
As I was here it also fixes ::contains to avoid repeated bounds
checking and the same issue in ::lower_bound which also suffers
from unnecessary copying around values.
* vec.h: Change m_vecdata references to address ().
* vec.h (vec<T, A, vl_embed>::lower_bound): Adjust to
take a const reference to the object, use address to
access data.
(vec<T, A, vl_embed>::contains): Use address to access data.
(vec<T, A, vl_embed>::operator[]): Use address instead of
m_vecdata to access data.
(vec<T, A, vl_embed>::iterate): Likewise.
(vec<T, A, vl_embed>::copy): Likewise.
(vec<T, A, vl_embed>::quick_push): Likewise.
(vec<T, A, vl_embed>::pop): Likewise.
(vec<T, A, vl_embed>::quick_insert): Likewise.
(vec<T, A, vl_embed>::ordered_remove): Likewise.
(vec<T, A, vl_embed>::unordered_remove): Likewise.
(vec<T, A, vl_embed>::block_remove): Likewise.
(vec<T, A, vl_heap>::address): Likewise.
---
gcc/vec.h | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/gcc/vec.h b/gcc/vec.h
index a536b68732d..5a2ee9c0294 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -614,7 +614,7 @@ public:
T *bsearch (const void *key, int (*compar)(const void *, const void *));
T *bsearch (const void *key,
int (*compar)(const void *, const void *, void *), void *);
- unsigned lower_bound (T, bool (*)(const T &, const T &)) const;
+ unsigned lower_bound (const T &, bool (*)(const T &, const T &)) const;
bool contains (const T &search) const;
static size_t embedded_size (unsigned);
void embedded_init (unsigned, unsigned = 0, unsigned = 0);
@@ -879,7 +879,7 @@ inline const T &
vec<T, A, vl_embed>::operator[] (unsigned ix) const
{
gcc_checking_assert (ix < m_vecpfx.m_num);
- return m_vecdata[ix];
+ return address ()[ix];
}
template<typename T, typename A>
@@ -887,7 +887,7 @@ inline T &
vec<T, A, vl_embed>::operator[] (unsigned ix)
{
gcc_checking_assert (ix < m_vecpfx.m_num);
- return m_vecdata[ix];
+ return address ()[ix];
}
@@ -929,7 +929,7 @@ vec<T, A, vl_embed>::iterate (unsigned ix, T *ptr) const
{
if (ix < m_vecpfx.m_num)
{
- *ptr = m_vecdata[ix];
+ *ptr = address()[ix];
return true;
}
else
@@ -955,7 +955,7 @@ vec<T, A, vl_embed>::iterate (unsigned ix, T **ptr) const
{
if (ix < m_vecpfx.m_num)
{
- *ptr = CONST_CAST (T *, &m_vecdata[ix]);
+ *ptr = CONST_CAST (T *, &address ()[ix]);
return true;
}
else
@@ -978,7 +978,7 @@ vec<T, A, vl_embed>::copy (ALONE_MEM_STAT_DECL) const
{
vec_alloc (new_vec, len PASS_MEM_STAT);
new_vec->embedded_init (len, len);
- vec_copy_construct (new_vec->address (), m_vecdata, len);
+ vec_copy_construct (new_vec->address (), address (), len);
}
return new_vec;
}
@@ -1018,7 +1018,7 @@ inline T *
vec<T, A, vl_embed>::quick_push (const T &obj)
{
gcc_checking_assert (space (1));
- T *slot = &m_vecdata[m_vecpfx.m_num++];
+ T *slot = &address ()[m_vecpfx.m_num++];
*slot = obj;
return slot;
}
@@ -1031,7 +1031,7 @@ inline T &
vec<T, A, vl_embed>::pop (void)
{
gcc_checking_assert (length () > 0);
- return m_vecdata[--m_vecpfx.m_num];
+ return address ()[--m_vecpfx.m_num];
}
@@ -1056,7 +1056,7 @@ vec<T, A, vl_embed>::quick_insert (unsigned ix, const T
&obj)
{
gcc_checking_assert (length () < allocated ());
gcc_checking_assert (ix <= length ());
- T *slot = &m_vecdata[ix];
+ T *slot = &address ()[ix];
memmove (slot + 1, slot, (m_vecpfx.m_num++ - ix) * sizeof (T));
*slot = obj;
}
@@ -1071,7 +1071,7 @@ inline void
vec<T, A, vl_embed>::ordered_remove (unsigned ix)
{
gcc_checking_assert (ix < length ());
- T *slot = &m_vecdata[ix];
+ T *slot = &address ()[ix];
memmove (slot, slot + 1, (--m_vecpfx.m_num - ix) * sizeof (T));
}
@@ -1118,7 +1118,7 @@ inline void
vec<T, A, vl_embed>::unordered_remove (unsigned ix)
{
gcc_checking_assert (ix < length ());
- m_vecdata[ix] = m_vecdata[--m_vecpfx.m_num];
+ address ()[ix] = address ()[--m_vecpfx.m_num];
}
@@ -1130,7 +1130,7 @@ inline void
vec<T, A, vl_embed>::block_remove (unsigned ix, unsigned len)
{
gcc_checking_assert (ix + len <= length ());
- T *slot = &m_vecdata[ix];
+ T *slot = &address ()[ix];
m_vecpfx.m_num -= len;
memmove (slot, slot + len, (m_vecpfx.m_num - ix) * sizeof (T));
}
@@ -1249,8 +1249,11 @@ vec<T, A, vl_embed>::contains (const T &search) const
{
unsigned int len = length ();
for (unsigned int i = 0; i < len; i++)
- if ((*this)[i] == search)
- return true;
+ {
+ const T *slot = &address ()[i];
+ if (*slot == search)
+ return true;
+ }
return false;
}
@@ -1262,7 +1265,8 @@ vec<T, A, vl_embed>::contains (const T &search) const
template<typename T, typename A>
unsigned
-vec<T, A, vl_embed>::lower_bound (T obj, bool (*lessthan)(const T &, const T
&))
+vec<T, A, vl_embed>::lower_bound (const T &obj,
+ bool (*lessthan)(const T &, const T &))
const
{
unsigned int len = length ();
@@ -1273,7 +1277,7 @@ vec<T, A, vl_embed>::lower_bound (T obj, bool
(*lessthan)(const T &, const T &))
half = len / 2;
middle = first;
middle += half;
- T middle_elem = (*this)[middle];
+ const T &middle_elem = address ()[middle];
if (lessthan (middle_elem, obj))
{
first = middle;
@@ -1476,10 +1480,10 @@ public:
{ return m_vec ? m_vec->length () : 0; }
T *address (void)
- { return m_vec ? m_vec->m_vecdata : NULL; }
+ { return m_vec ? m_vec->address () : NULL; }
const T *address (void) const
- { return m_vec ? m_vec->m_vecdata : NULL; }
+ { return m_vec ? m_vec->address () : NULL; }
T *begin () { return address (); }
const T *begin () const { return address (); }
--
2.35.3
