mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-04 13:57:12 +08:00
cf57ad6d61
While working on another patch I ran into an issue with unordered_remove (in gdb_vecs.h), where removing the last item of the vector can cause a self move assign. When compiling the C++ standard library in debug mode (with -D_GLIBCXX_DEBUG=1) this causes an error to trigger. I've fixed the issue in this patch and provided a unit test. The provided unit test includes an assignment operator which checks for self move assign, this removes the need to compile with -D_GLIBCXX_DEBUG=1 in order to spot the bug. If you're keen to see the error reported from the C++ standard library then remove operator= from the unit test and recompile GDB with -D_GLIBCXX_DEBUG=1. gdb/ChangeLog: * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add new file to the list. * unittests/vec-utils-selftests.c: New file. * gdbsupport/gdb_vecs.h (unordered_remove): Avoid self move assign. Change-Id: I80247b20cd5212038117db7412865f5e6a9257cd
89 lines
2.7 KiB
C++
89 lines
2.7 KiB
C++
/* Some commonly-used VEC types.
|
|
|
|
Copyright (C) 2012-2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef COMMON_GDB_VECS_H
|
|
#define COMMON_GDB_VECS_H
|
|
|
|
/* Split STR, a list of DELIMITER-separated fields, into a char pointer vector.
|
|
|
|
You may modify the returned strings. */
|
|
|
|
extern std::vector<gdb::unique_xmalloc_ptr<char>>
|
|
delim_string_to_char_ptr_vec (const char *str, char delimiter);
|
|
|
|
/* Like dirnames_to_char_ptr_vec, but append the directories to *VECP. */
|
|
|
|
extern void dirnames_to_char_ptr_vec_append
|
|
(std::vector<gdb::unique_xmalloc_ptr<char>> *vecp, const char *dirnames);
|
|
|
|
/* Split DIRNAMES by DIRNAME_SEPARATOR delimiter and return a list of all the
|
|
elements in their original order. For empty string ("") DIRNAMES return
|
|
list of one empty string ("") element.
|
|
|
|
You may modify the returned strings. */
|
|
|
|
extern std::vector<gdb::unique_xmalloc_ptr<char>>
|
|
dirnames_to_char_ptr_vec (const char *dirnames);
|
|
|
|
/* Remove the element pointed by iterator IT from VEC, not preserving the order
|
|
of the remaining elements. Return the removed element. */
|
|
|
|
template <typename T>
|
|
T
|
|
unordered_remove (std::vector<T> &vec, typename std::vector<T>::iterator it)
|
|
{
|
|
gdb_assert (it >= vec.begin () && it < vec.end ());
|
|
|
|
T removed = std::move (*it);
|
|
if (it != vec.end () - 1)
|
|
*it = std::move (vec.back ());
|
|
vec.pop_back ();
|
|
|
|
return removed;
|
|
}
|
|
|
|
/* Remove the element at position IX from VEC, not preserving the order of the
|
|
remaining elements. Return the removed element. */
|
|
|
|
template <typename T>
|
|
T
|
|
unordered_remove (std::vector<T> &vec, typename std::vector<T>::size_type ix)
|
|
{
|
|
gdb_assert (ix < vec.size ());
|
|
|
|
return unordered_remove (vec, vec.begin () + ix);
|
|
}
|
|
|
|
/* Remove the element at position IX from VEC, preserving the order the
|
|
remaining elements. Return the removed element. */
|
|
|
|
template <typename T>
|
|
T
|
|
ordered_remove (std::vector<T> &vec, typename std::vector<T>::size_type ix)
|
|
{
|
|
gdb_assert (ix < vec.size ());
|
|
|
|
T removed = std::move (vec[ix]);
|
|
vec.erase (vec.begin () + ix);
|
|
|
|
return removed;
|
|
}
|
|
|
|
#endif /* COMMON_GDB_VECS_H */
|