2017-09-05 00:10:12 +08:00
|
|
|
/* Self tests for array_view for GDB, the GNU debugger.
|
|
|
|
|
2022-01-01 22:56:03 +08:00
|
|
|
Copyright (C) 2017-2022 Free Software Foundation, Inc.
|
2017-09-05 00:10:12 +08:00
|
|
|
|
|
|
|
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/>. */
|
|
|
|
|
|
|
|
#include "defs.h"
|
Rename common to gdbsupport
This is the next patch in the ongoing series to move gdbsever to the
top level.
This patch just renames the "common" directory. The idea is to do
this move in two parts: first rename the directory (this patch), then
move the directory to the top. This approach makes the patches a bit
more tractable.
I chose the name "gdbsupport" for the directory. However, as this
patch was largely written by sed, we could pick a new name without too
much difficulty.
Tested by the buildbot.
gdb/ChangeLog
2019-07-09 Tom Tromey <tom@tromey.com>
* contrib/ari/gdb_ari.sh: Change common to gdbsupport.
* configure: Rebuild.
* configure.ac: Change common to gdbsupport.
* gdbsupport: Rename from common.
* acinclude.m4: Change common to gdbsupport.
* Makefile.in (CONFIG_SRC_SUBDIR, COMMON_SFILES)
(HFILES_NO_SRCDIR, stamp-version, ALLDEPFILES): Change common to
gdbsupport.
* aarch64-tdep.c, ada-lang.c, ada-lang.h, agent.c, alloc.c,
amd64-darwin-tdep.c, amd64-dicos-tdep.c, amd64-fbsd-nat.c,
amd64-fbsd-tdep.c, amd64-linux-nat.c, amd64-linux-tdep.c,
amd64-nbsd-tdep.c, amd64-obsd-tdep.c, amd64-sol2-tdep.c,
amd64-tdep.c, amd64-windows-tdep.c, arch-utils.c,
arch/aarch64-insn.c, arch/aarch64.c, arch/aarch64.h, arch/amd64.c,
arch/amd64.h, arch/arm-get-next-pcs.c, arch/arm-linux.c,
arch/arm.c, arch/i386.c, arch/i386.h, arch/ppc-linux-common.c,
arch/riscv.c, arch/riscv.h, arch/tic6x.c, arm-tdep.c, auto-load.c,
auxv.c, ax-gdb.c, ax-general.c, ax.h, breakpoint.c, breakpoint.h,
btrace.c, btrace.h, build-id.c, build-id.h, c-lang.h, charset.c,
charset.h, cli/cli-cmds.c, cli/cli-cmds.h, cli/cli-decode.c,
cli/cli-dump.c, cli/cli-option.h, cli/cli-script.c,
coff-pe-read.c, command.h, compile/compile-c-support.c,
compile/compile-c.h, compile/compile-cplus-symbols.c,
compile/compile-cplus-types.c, compile/compile-cplus.h,
compile/compile-loc2c.c, compile/compile.c, completer.c,
completer.h, contrib/ari/gdb_ari.sh, corefile.c, corelow.c,
cp-support.c, cp-support.h, cp-valprint.c, csky-tdep.c, ctf.c,
darwin-nat.c, debug.c, defs.h, disasm-selftests.c, disasm.c,
disasm.h, dtrace-probe.c, dwarf-index-cache.c,
dwarf-index-cache.h, dwarf-index-write.c, dwarf2-frame.c,
dwarf2expr.c, dwarf2loc.c, dwarf2read.c, event-loop.c,
event-top.c, exceptions.c, exec.c, extension.h, fbsd-nat.c,
features/aarch64-core.c, features/aarch64-fpu.c,
features/aarch64-pauth.c, features/aarch64-sve.c,
features/i386/32bit-avx.c, features/i386/32bit-avx512.c,
features/i386/32bit-core.c, features/i386/32bit-linux.c,
features/i386/32bit-mpx.c, features/i386/32bit-pkeys.c,
features/i386/32bit-segments.c, features/i386/32bit-sse.c,
features/i386/64bit-avx.c, features/i386/64bit-avx512.c,
features/i386/64bit-core.c, features/i386/64bit-linux.c,
features/i386/64bit-mpx.c, features/i386/64bit-pkeys.c,
features/i386/64bit-segments.c, features/i386/64bit-sse.c,
features/i386/x32-core.c, features/riscv/32bit-cpu.c,
features/riscv/32bit-csr.c, features/riscv/32bit-fpu.c,
features/riscv/64bit-cpu.c, features/riscv/64bit-csr.c,
features/riscv/64bit-fpu.c, features/tic6x-c6xp.c,
features/tic6x-core.c, features/tic6x-gp.c, filename-seen-cache.h,
findcmd.c, findvar.c, fork-child.c, gcore.c, gdb_bfd.c, gdb_bfd.h,
gdb_proc_service.h, gdb_regex.c, gdb_select.h, gdb_usleep.c,
gdbarch-selftests.c, gdbthread.h, gdbtypes.h, gnu-nat.c,
go32-nat.c, guile/guile.c, guile/scm-ports.c,
guile/scm-safe-call.c, guile/scm-type.c, i386-fbsd-nat.c,
i386-fbsd-tdep.c, i386-go32-tdep.c, i386-linux-nat.c,
i386-linux-tdep.c, i386-tdep.c, i387-tdep.c,
ia64-libunwind-tdep.c, ia64-linux-nat.c, inf-child.c,
inf-ptrace.c, infcall.c, infcall.h, infcmd.c, inferior-iter.h,
inferior.c, inferior.h, inflow.c, inflow.h, infrun.c, infrun.h,
inline-frame.c, language.h, linespec.c, linux-fork.c, linux-nat.c,
linux-tdep.c, linux-thread-db.c, location.c, machoread.c,
macrotab.h, main.c, maint.c, maint.h, memattr.c, memrange.h,
mi/mi-cmd-break.h, mi/mi-cmd-env.c, mi/mi-cmd-stack.c,
mi/mi-cmd-var.c, mi/mi-interp.c, mi/mi-main.c, mi/mi-parse.h,
minsyms.c, mips-linux-tdep.c, namespace.h,
nat/aarch64-linux-hw-point.c, nat/aarch64-linux-hw-point.h,
nat/aarch64-linux.c, nat/aarch64-sve-linux-ptrace.c,
nat/amd64-linux-siginfo.c, nat/fork-inferior.c,
nat/linux-btrace.c, nat/linux-btrace.h, nat/linux-namespaces.c,
nat/linux-nat.h, nat/linux-osdata.c, nat/linux-personality.c,
nat/linux-procfs.c, nat/linux-ptrace.c, nat/linux-ptrace.h,
nat/linux-waitpid.c, nat/mips-linux-watch.c,
nat/mips-linux-watch.h, nat/ppc-linux.c, nat/x86-dregs.c,
nat/x86-dregs.h, nat/x86-linux-dregs.c, nat/x86-linux.c,
nto-procfs.c, nto-tdep.c, objfile-flags.h, objfiles.c, objfiles.h,
obsd-nat.c, observable.h, osdata.c, p-valprint.c, parse.c,
parser-defs.h, ppc-linux-nat.c, printcmd.c, probe.c, proc-api.c,
procfs.c, producer.c, progspace.h, psymtab.h,
python/py-framefilter.c, python/py-inferior.c, python/py-ref.h,
python/py-type.c, python/python.c, record-btrace.c, record-full.c,
record.c, record.h, regcache-dump.c, regcache.c, regcache.h,
remote-fileio.c, remote-fileio.h, remote-sim.c, remote.c,
riscv-tdep.c, rs6000-aix-tdep.c, rust-exp.y, s12z-tdep.c,
selftest-arch.c, ser-base.c, ser-event.c, ser-pipe.c, ser-tcp.c,
ser-unix.c, skip.c, solib-aix.c, solib-target.c, solib.c,
source-cache.c, source.c, source.h, sparc-nat.c, spu-linux-nat.c,
stack.c, stap-probe.c, symfile-add-flags.h, symfile.c, symfile.h,
symtab.c, symtab.h, target-descriptions.c, target-descriptions.h,
target-memory.c, target.c, target.h, target/waitstatus.c,
target/waitstatus.h, thread-iter.h, thread.c, tilegx-tdep.c,
top.c, top.h, tracefile-tfile.c, tracefile.c, tracepoint.c,
tracepoint.h, tui/tui-io.c, ui-file.c, ui-out.h,
unittests/array-view-selftests.c,
unittests/child-path-selftests.c, unittests/cli-utils-selftests.c,
unittests/common-utils-selftests.c,
unittests/copy_bitwise-selftests.c, unittests/environ-selftests.c,
unittests/format_pieces-selftests.c,
unittests/function-view-selftests.c,
unittests/lookup_name_info-selftests.c,
unittests/memory-map-selftests.c, unittests/memrange-selftests.c,
unittests/mkdir-recursive-selftests.c,
unittests/observable-selftests.c,
unittests/offset-type-selftests.c, unittests/optional-selftests.c,
unittests/parse-connection-spec-selftests.c,
unittests/ptid-selftests.c, unittests/rsp-low-selftests.c,
unittests/scoped_fd-selftests.c,
unittests/scoped_mmap-selftests.c,
unittests/scoped_restore-selftests.c,
unittests/string_view-selftests.c, unittests/style-selftests.c,
unittests/tracepoint-selftests.c, unittests/unpack-selftests.c,
unittests/utils-selftests.c, unittests/xml-utils-selftests.c,
utils.c, utils.h, valarith.c, valops.c, valprint.c, value.c,
value.h, varobj.c, varobj.h, windows-nat.c, x86-linux-nat.c,
xml-support.c, xml-support.h, xml-tdesc.h, xstormy16-tdep.c,
xtensa-linux-nat.c, dwarf2read.h: Change common to gdbsupport.
gdb/gdbserver/ChangeLog
2019-07-09 Tom Tromey <tom@tromey.com>
* configure: Rebuild.
* configure.ac: Change common to gdbsupport.
* acinclude.m4: Change common to gdbsupport.
* Makefile.in (SFILES, OBS, GDBREPLAY_OBS, IPA_OBJS)
(version-generated.c, gdbsupport/%-ipa.o, gdbsupport/%.o): Change
common to gdbsupport.
* ax.c, event-loop.c, fork-child.c, gdb_proc_service.h,
gdbreplay.c, gdbthread.h, hostio-errno.c, hostio.c, i387-fp.c,
inferiors.c, inferiors.h, linux-aarch64-tdesc-selftest.c,
linux-amd64-ipa.c, linux-i386-ipa.c, linux-low.c,
linux-tic6x-low.c, linux-x86-low.c, linux-x86-tdesc-selftest.c,
linux-x86-tdesc.c, lynx-i386-low.c, lynx-low.c, mem-break.h,
nto-x86-low.c, regcache.c, regcache.h, remote-utils.c, server.c,
server.h, spu-low.c, symbol.c, target.h, tdesc.c, tdesc.h,
thread-db.c, tracepoint.c, win32-i386-low.c, win32-low.c: Change
common to gdbsupport.
2019-05-06 10:29:24 +08:00
|
|
|
#include "gdbsupport/selftest.h"
|
|
|
|
#include "gdbsupport/array-view.h"
|
2017-09-05 06:58:38 +08:00
|
|
|
#include <array>
|
Improve gdb::array_view ctor from contiguous containers
While reading the interface of gdb::array_view, I realized that the
constructor that builds an array_view on top of a contiguous container
(such as std::vector, std::array or even gdb::array_view) can be
missused.
Lets consider the following code sample:
struct Parent
{
Parent (int a): a { a } {}
int a;
};
std::ostream &operator<< (std::ostream& os, const Parent & p)
{ os << "Parent {a=" << p.a << "}"; return os; }
struct Child : public Parent
{
Child (int a, int b): Parent { a }, b { b } {}
int b;
};
std::ostream &operator<< (std::ostream& os, const Child & p)
{ os << "Child {a=" << p.a << ", b=" << p.b << "}"; return os; }
template <typename T>
void print (const gdb::array_view<const T> &p)
{
std::for_each (p.begin (), p.end (), [](const T &p) { std::cout << p << '\n'; });
}
Then with the current interface nothinng prevents this usage of
array_view to be done:
const std::array<Child, 3> elts = {
Child {1, 2},
Child {3, 4},
Child {5, 6}
};
print_all<Parent> (elts);
This compiles fine and produces the following output:
Parent {a=1}
Parent {a=2}
Parent {a=3}
which is obviously wrong. There is nowhere in memory a Parent-like
object for which the A member is 2 and this call to print_all<Parent>
shold not compile at all (calling print_all<Child> is however fine).
This comes down to the fact that a Child* is convertible into a Parent*,
and that an array view is constructed to a pointer to the first element
and a size. The valid type pointed to that can be used with this
constructor are restricted using SFINAE, which requires that a
pointer to a member into the underlying container can be converted into a
pointer the array_view's data type.
This patch proposes to change the constraints on the gdb::array_view
ctor which accepts a container now requires that the (decayed) type of
the elements in the container match the (decayed) type of the array_view
being constructed.
Applying this change required minimum adjustment in GDB codebase, which
are also included in this patch.
Tested by rebuilding.
2021-10-20 05:51:40 +08:00
|
|
|
#include <vector>
|
2017-09-05 00:10:12 +08:00
|
|
|
|
|
|
|
namespace selftests {
|
|
|
|
namespace array_view_tests {
|
|
|
|
|
|
|
|
/* Triviality checks. */
|
|
|
|
#define CHECK_TRAIT(TRAIT) \
|
|
|
|
static_assert (std::TRAIT<gdb::array_view<gdb_byte>>::value, "")
|
|
|
|
|
|
|
|
#if HAVE_IS_TRIVIALLY_COPYABLE
|
|
|
|
|
|
|
|
CHECK_TRAIT (is_trivially_copyable);
|
|
|
|
CHECK_TRAIT (is_trivially_move_assignable);
|
|
|
|
CHECK_TRAIT (is_trivially_move_constructible);
|
|
|
|
CHECK_TRAIT (is_trivially_destructible);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#undef CHECK_TRAIT
|
|
|
|
|
|
|
|
/* Wrapper around std::is_convertible to make the code using it a bit
|
|
|
|
shorter. (With C++14 we'd use a variable template instead.) */
|
|
|
|
|
|
|
|
template<typename From, typename To>
|
|
|
|
static constexpr bool
|
|
|
|
is_convertible ()
|
|
|
|
{
|
|
|
|
return std::is_convertible<From, To>::value;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for implicit conversion to immutable and mutable views. */
|
|
|
|
|
|
|
|
static constexpr bool
|
|
|
|
check_convertible ()
|
|
|
|
{
|
|
|
|
using T = gdb_byte;
|
|
|
|
using gdb::array_view;
|
|
|
|
|
|
|
|
return (true
|
|
|
|
/* immutable array_view */
|
|
|
|
&& is_convertible<const T (&) [1], array_view<const T>> ()
|
|
|
|
&& is_convertible<T (&) [1], array_view<const T>> ()
|
|
|
|
&& is_convertible<const T, array_view<const T>> ()
|
|
|
|
&& is_convertible<T, array_view<const T>> ()
|
|
|
|
|
|
|
|
/* mutable array_view */
|
|
|
|
&& is_convertible<T (&) [1], array_view<T>> ()
|
|
|
|
&& !is_convertible<const T (&) [1], array_view<T>> ()
|
|
|
|
&& is_convertible<T, array_view<T>> ()
|
|
|
|
&& !is_convertible<const T, array_view<T>> ()
|
|
|
|
|
|
|
|
/* While float is implicitly convertible to gdb_byte, we
|
|
|
|
don't want implicit float->array_view<gdb_byte>
|
|
|
|
conversion. */
|
|
|
|
&& !is_convertible<float, array_view<const T>> ()
|
|
|
|
&& !is_convertible<float, array_view<T>> ());
|
|
|
|
}
|
|
|
|
|
|
|
|
static_assert (check_convertible (), "");
|
|
|
|
|
|
|
|
namespace no_slicing
|
|
|
|
{
|
|
|
|
struct A { int i; };
|
|
|
|
struct B : A { int j; };
|
|
|
|
struct C : A { int l; };
|
|
|
|
|
Improve gdb::array_view ctor from contiguous containers
While reading the interface of gdb::array_view, I realized that the
constructor that builds an array_view on top of a contiguous container
(such as std::vector, std::array or even gdb::array_view) can be
missused.
Lets consider the following code sample:
struct Parent
{
Parent (int a): a { a } {}
int a;
};
std::ostream &operator<< (std::ostream& os, const Parent & p)
{ os << "Parent {a=" << p.a << "}"; return os; }
struct Child : public Parent
{
Child (int a, int b): Parent { a }, b { b } {}
int b;
};
std::ostream &operator<< (std::ostream& os, const Child & p)
{ os << "Child {a=" << p.a << ", b=" << p.b << "}"; return os; }
template <typename T>
void print (const gdb::array_view<const T> &p)
{
std::for_each (p.begin (), p.end (), [](const T &p) { std::cout << p << '\n'; });
}
Then with the current interface nothinng prevents this usage of
array_view to be done:
const std::array<Child, 3> elts = {
Child {1, 2},
Child {3, 4},
Child {5, 6}
};
print_all<Parent> (elts);
This compiles fine and produces the following output:
Parent {a=1}
Parent {a=2}
Parent {a=3}
which is obviously wrong. There is nowhere in memory a Parent-like
object for which the A member is 2 and this call to print_all<Parent>
shold not compile at all (calling print_all<Child> is however fine).
This comes down to the fact that a Child* is convertible into a Parent*,
and that an array view is constructed to a pointer to the first element
and a size. The valid type pointed to that can be used with this
constructor are restricted using SFINAE, which requires that a
pointer to a member into the underlying container can be converted into a
pointer the array_view's data type.
This patch proposes to change the constraints on the gdb::array_view
ctor which accepts a container now requires that the (decayed) type of
the elements in the container match the (decayed) type of the array_view
being constructed.
Applying this change required minimum adjustment in GDB codebase, which
are also included in this patch.
Tested by rebuilding.
2021-10-20 05:51:40 +08:00
|
|
|
/* Check that there's no array->view conversion for arrays of derived types or
|
|
|
|
subclasses. */
|
2017-09-05 00:10:12 +08:00
|
|
|
static constexpr bool
|
|
|
|
check ()
|
|
|
|
{
|
|
|
|
using gdb::array_view;
|
|
|
|
|
|
|
|
return (true
|
|
|
|
|
|
|
|
/* array->view */
|
|
|
|
|
|
|
|
&& is_convertible <A (&)[1], array_view<A>> ()
|
|
|
|
&& !is_convertible <B (&)[1], array_view<A>> ()
|
|
|
|
&& !is_convertible <C (&)[1], array_view<A>> ()
|
|
|
|
|
|
|
|
&& !is_convertible <A (&)[1], array_view<B>> ()
|
|
|
|
&& is_convertible <B (&)[1], array_view<B>> ()
|
|
|
|
&& !is_convertible <C (&)[1], array_view<B>> ()
|
|
|
|
|
|
|
|
/* elem->view */
|
|
|
|
|
|
|
|
&& is_convertible <A, array_view<A>> ()
|
|
|
|
&& !is_convertible <B, array_view<A>> ()
|
|
|
|
&& !is_convertible <C, array_view<A>> ()
|
|
|
|
|
|
|
|
&& !is_convertible <A, array_view<B>> ()
|
|
|
|
&& is_convertible <B, array_view<B>> ()
|
|
|
|
&& !is_convertible <C, array_view<B>> ());
|
|
|
|
}
|
|
|
|
|
Improve gdb::array_view ctor from contiguous containers
While reading the interface of gdb::array_view, I realized that the
constructor that builds an array_view on top of a contiguous container
(such as std::vector, std::array or even gdb::array_view) can be
missused.
Lets consider the following code sample:
struct Parent
{
Parent (int a): a { a } {}
int a;
};
std::ostream &operator<< (std::ostream& os, const Parent & p)
{ os << "Parent {a=" << p.a << "}"; return os; }
struct Child : public Parent
{
Child (int a, int b): Parent { a }, b { b } {}
int b;
};
std::ostream &operator<< (std::ostream& os, const Child & p)
{ os << "Child {a=" << p.a << ", b=" << p.b << "}"; return os; }
template <typename T>
void print (const gdb::array_view<const T> &p)
{
std::for_each (p.begin (), p.end (), [](const T &p) { std::cout << p << '\n'; });
}
Then with the current interface nothinng prevents this usage of
array_view to be done:
const std::array<Child, 3> elts = {
Child {1, 2},
Child {3, 4},
Child {5, 6}
};
print_all<Parent> (elts);
This compiles fine and produces the following output:
Parent {a=1}
Parent {a=2}
Parent {a=3}
which is obviously wrong. There is nowhere in memory a Parent-like
object for which the A member is 2 and this call to print_all<Parent>
shold not compile at all (calling print_all<Child> is however fine).
This comes down to the fact that a Child* is convertible into a Parent*,
and that an array view is constructed to a pointer to the first element
and a size. The valid type pointed to that can be used with this
constructor are restricted using SFINAE, which requires that a
pointer to a member into the underlying container can be converted into a
pointer the array_view's data type.
This patch proposes to change the constraints on the gdb::array_view
ctor which accepts a container now requires that the (decayed) type of
the elements in the container match the (decayed) type of the array_view
being constructed.
Applying this change required minimum adjustment in GDB codebase, which
are also included in this patch.
Tested by rebuilding.
2021-10-20 05:51:40 +08:00
|
|
|
/* Check that there's no container->view conversion for containers of derived
|
|
|
|
types or subclasses. */
|
|
|
|
|
2021-11-19 05:35:34 +08:00
|
|
|
template<template<typename ...> class Container>
|
Improve gdb::array_view ctor from contiguous containers
While reading the interface of gdb::array_view, I realized that the
constructor that builds an array_view on top of a contiguous container
(such as std::vector, std::array or even gdb::array_view) can be
missused.
Lets consider the following code sample:
struct Parent
{
Parent (int a): a { a } {}
int a;
};
std::ostream &operator<< (std::ostream& os, const Parent & p)
{ os << "Parent {a=" << p.a << "}"; return os; }
struct Child : public Parent
{
Child (int a, int b): Parent { a }, b { b } {}
int b;
};
std::ostream &operator<< (std::ostream& os, const Child & p)
{ os << "Child {a=" << p.a << ", b=" << p.b << "}"; return os; }
template <typename T>
void print (const gdb::array_view<const T> &p)
{
std::for_each (p.begin (), p.end (), [](const T &p) { std::cout << p << '\n'; });
}
Then with the current interface nothinng prevents this usage of
array_view to be done:
const std::array<Child, 3> elts = {
Child {1, 2},
Child {3, 4},
Child {5, 6}
};
print_all<Parent> (elts);
This compiles fine and produces the following output:
Parent {a=1}
Parent {a=2}
Parent {a=3}
which is obviously wrong. There is nowhere in memory a Parent-like
object for which the A member is 2 and this call to print_all<Parent>
shold not compile at all (calling print_all<Child> is however fine).
This comes down to the fact that a Child* is convertible into a Parent*,
and that an array view is constructed to a pointer to the first element
and a size. The valid type pointed to that can be used with this
constructor are restricted using SFINAE, which requires that a
pointer to a member into the underlying container can be converted into a
pointer the array_view's data type.
This patch proposes to change the constraints on the gdb::array_view
ctor which accepts a container now requires that the (decayed) type of
the elements in the container match the (decayed) type of the array_view
being constructed.
Applying this change required minimum adjustment in GDB codebase, which
are also included in this patch.
Tested by rebuilding.
2021-10-20 05:51:40 +08:00
|
|
|
static constexpr bool
|
|
|
|
check_ctor_from_container ()
|
|
|
|
{
|
|
|
|
using gdb::array_view;
|
|
|
|
|
|
|
|
return ( is_convertible <Container<A>, array_view<A>> ()
|
|
|
|
&& !is_convertible <Container<B>, array_view<A>> ()
|
|
|
|
&& !is_convertible <Container<C>, array_view<A>> ()
|
|
|
|
|
|
|
|
&& !is_convertible <Container<A>, array_view<B>> ()
|
|
|
|
&& is_convertible <Container<B>, array_view<B>> ()
|
|
|
|
&& !is_convertible <Container<C>, array_view<B>> ());
|
|
|
|
}
|
|
|
|
|
2017-09-05 00:10:12 +08:00
|
|
|
} /* namespace no_slicing */
|
|
|
|
|
2021-11-10 01:48:50 +08:00
|
|
|
/* std::array with only one template argument, so we can pass it to
|
|
|
|
check_ctor_from_container. */
|
|
|
|
template<typename T> using StdArray1 = std::array<T, 1>;
|
|
|
|
|
2017-09-05 00:10:12 +08:00
|
|
|
static_assert (no_slicing::check (), "");
|
Improve gdb::array_view ctor from contiguous containers
While reading the interface of gdb::array_view, I realized that the
constructor that builds an array_view on top of a contiguous container
(such as std::vector, std::array or even gdb::array_view) can be
missused.
Lets consider the following code sample:
struct Parent
{
Parent (int a): a { a } {}
int a;
};
std::ostream &operator<< (std::ostream& os, const Parent & p)
{ os << "Parent {a=" << p.a << "}"; return os; }
struct Child : public Parent
{
Child (int a, int b): Parent { a }, b { b } {}
int b;
};
std::ostream &operator<< (std::ostream& os, const Child & p)
{ os << "Child {a=" << p.a << ", b=" << p.b << "}"; return os; }
template <typename T>
void print (const gdb::array_view<const T> &p)
{
std::for_each (p.begin (), p.end (), [](const T &p) { std::cout << p << '\n'; });
}
Then with the current interface nothinng prevents this usage of
array_view to be done:
const std::array<Child, 3> elts = {
Child {1, 2},
Child {3, 4},
Child {5, 6}
};
print_all<Parent> (elts);
This compiles fine and produces the following output:
Parent {a=1}
Parent {a=2}
Parent {a=3}
which is obviously wrong. There is nowhere in memory a Parent-like
object for which the A member is 2 and this call to print_all<Parent>
shold not compile at all (calling print_all<Child> is however fine).
This comes down to the fact that a Child* is convertible into a Parent*,
and that an array view is constructed to a pointer to the first element
and a size. The valid type pointed to that can be used with this
constructor are restricted using SFINAE, which requires that a
pointer to a member into the underlying container can be converted into a
pointer the array_view's data type.
This patch proposes to change the constraints on the gdb::array_view
ctor which accepts a container now requires that the (decayed) type of
the elements in the container match the (decayed) type of the array_view
being constructed.
Applying this change required minimum adjustment in GDB codebase, which
are also included in this patch.
Tested by rebuilding.
2021-10-20 05:51:40 +08:00
|
|
|
static_assert (no_slicing::check_ctor_from_container<std::vector> (), "");
|
2021-11-10 01:48:50 +08:00
|
|
|
static_assert (no_slicing::check_ctor_from_container<StdArray1> (), "");
|
Improve gdb::array_view ctor from contiguous containers
While reading the interface of gdb::array_view, I realized that the
constructor that builds an array_view on top of a contiguous container
(such as std::vector, std::array or even gdb::array_view) can be
missused.
Lets consider the following code sample:
struct Parent
{
Parent (int a): a { a } {}
int a;
};
std::ostream &operator<< (std::ostream& os, const Parent & p)
{ os << "Parent {a=" << p.a << "}"; return os; }
struct Child : public Parent
{
Child (int a, int b): Parent { a }, b { b } {}
int b;
};
std::ostream &operator<< (std::ostream& os, const Child & p)
{ os << "Child {a=" << p.a << ", b=" << p.b << "}"; return os; }
template <typename T>
void print (const gdb::array_view<const T> &p)
{
std::for_each (p.begin (), p.end (), [](const T &p) { std::cout << p << '\n'; });
}
Then with the current interface nothinng prevents this usage of
array_view to be done:
const std::array<Child, 3> elts = {
Child {1, 2},
Child {3, 4},
Child {5, 6}
};
print_all<Parent> (elts);
This compiles fine and produces the following output:
Parent {a=1}
Parent {a=2}
Parent {a=3}
which is obviously wrong. There is nowhere in memory a Parent-like
object for which the A member is 2 and this call to print_all<Parent>
shold not compile at all (calling print_all<Child> is however fine).
This comes down to the fact that a Child* is convertible into a Parent*,
and that an array view is constructed to a pointer to the first element
and a size. The valid type pointed to that can be used with this
constructor are restricted using SFINAE, which requires that a
pointer to a member into the underlying container can be converted into a
pointer the array_view's data type.
This patch proposes to change the constraints on the gdb::array_view
ctor which accepts a container now requires that the (decayed) type of
the elements in the container match the (decayed) type of the array_view
being constructed.
Applying this change required minimum adjustment in GDB codebase, which
are also included in this patch.
Tested by rebuilding.
2021-10-20 05:51:40 +08:00
|
|
|
static_assert (no_slicing::check_ctor_from_container<gdb::array_view> (), "");
|
2017-09-05 00:10:12 +08:00
|
|
|
|
|
|
|
/* Check that array_view implicitly converts from std::vector. */
|
|
|
|
|
|
|
|
static constexpr bool
|
|
|
|
check_convertible_from_std_vector ()
|
|
|
|
{
|
|
|
|
using gdb::array_view;
|
|
|
|
using T = gdb_byte;
|
|
|
|
|
|
|
|
/* Note there's no such thing as std::vector<const T>. */
|
|
|
|
|
|
|
|
return (true
|
|
|
|
&& is_convertible <std::vector<T>, array_view<T>> ()
|
|
|
|
&& is_convertible <std::vector<T>, array_view<const T>> ());
|
|
|
|
}
|
|
|
|
|
|
|
|
static_assert (check_convertible_from_std_vector (), "");
|
|
|
|
|
|
|
|
/* Check that array_view implicitly converts from std::array. */
|
|
|
|
|
|
|
|
static constexpr bool
|
|
|
|
check_convertible_from_std_array ()
|
|
|
|
{
|
|
|
|
using gdb::array_view;
|
|
|
|
using T = gdb_byte;
|
|
|
|
|
|
|
|
/* Note: a non-const T view can't refer to a const T array. */
|
|
|
|
|
|
|
|
return (true
|
|
|
|
&& is_convertible <std::array<T, 1>, array_view<T>> ()
|
|
|
|
&& is_convertible <std::array<T, 1>, array_view<const T>> ()
|
|
|
|
&& !is_convertible <std::array<const T, 1>, array_view<T>> ()
|
|
|
|
&& is_convertible <std::array<const T, 1>, array_view<const T>> ());
|
|
|
|
}
|
|
|
|
|
|
|
|
static_assert (check_convertible_from_std_array (), "");
|
|
|
|
|
|
|
|
/* Check that VIEW views C (a container like std::vector/std::array)
|
|
|
|
correctly. */
|
|
|
|
|
|
|
|
template<typename View, typename Container>
|
|
|
|
static bool
|
|
|
|
check_container_view (const View &view, const Container &c)
|
|
|
|
{
|
|
|
|
if (view.empty ())
|
|
|
|
return false;
|
|
|
|
if (view.size () != c.size ())
|
|
|
|
return false;
|
|
|
|
if (view.data () != c.data ())
|
|
|
|
return false;
|
|
|
|
for (size_t i = 0; i < c.size (); i++)
|
|
|
|
{
|
|
|
|
if (&view[i] != &c[i])
|
|
|
|
return false;
|
|
|
|
if (view[i] != c[i])
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that VIEW views E (an object of the type of a view element)
|
|
|
|
correctly. */
|
|
|
|
|
|
|
|
template<typename View, typename Elem>
|
|
|
|
static bool
|
|
|
|
check_elem_view (const View &view, const Elem &e)
|
|
|
|
{
|
|
|
|
if (view.empty ())
|
|
|
|
return false;
|
|
|
|
if (view.size () != 1)
|
|
|
|
return false;
|
|
|
|
if (view.data () != &e)
|
|
|
|
return false;
|
|
|
|
if (&view[0] != &e)
|
|
|
|
return false;
|
|
|
|
if (view[0] != e)
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for operator[]. The first overload is taken iff
|
|
|
|
'view<T>()[0] = T()' is a valid expression. */
|
|
|
|
|
|
|
|
template<typename View,
|
|
|
|
typename = decltype (std::declval<View> ()[0]
|
|
|
|
= std::declval<typename View::value_type> ())>
|
|
|
|
static bool
|
|
|
|
check_op_subscript (const View &view)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This overload is taken iff 'view<T>()[0] = T()' is not a valid
|
|
|
|
expression. */
|
|
|
|
|
|
|
|
static bool
|
|
|
|
check_op_subscript (...)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check construction with pointer + size. This is a template in
|
|
|
|
order to test both gdb_byte and const gdb_byte. */
|
|
|
|
|
|
|
|
template<typename T>
|
|
|
|
static void
|
|
|
|
check_ptr_size_ctor ()
|
|
|
|
{
|
|
|
|
T data[] = {0x11, 0x22, 0x33, 0x44};
|
|
|
|
|
|
|
|
gdb::array_view<T> view (data + 1, 2);
|
|
|
|
|
|
|
|
SELF_CHECK (!view.empty ());
|
|
|
|
SELF_CHECK (view.size () == 2);
|
|
|
|
SELF_CHECK (view.data () == &data[1]);
|
|
|
|
SELF_CHECK (view[0] == data[1]);
|
|
|
|
SELF_CHECK (view[1] == data[2]);
|
|
|
|
|
|
|
|
gdb::array_view<const T> cview (data + 1, 2);
|
|
|
|
SELF_CHECK (!cview.empty ());
|
|
|
|
SELF_CHECK (cview.size () == 2);
|
|
|
|
SELF_CHECK (cview.data () == &data[1]);
|
|
|
|
SELF_CHECK (cview[0] == data[1]);
|
|
|
|
SELF_CHECK (cview[1] == data[2]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Asserts std::is_constructible. */
|
|
|
|
|
|
|
|
template<typename T, typename... Args>
|
|
|
|
static constexpr bool
|
|
|
|
require_not_constructible ()
|
|
|
|
{
|
|
|
|
static_assert (!std::is_constructible<T, Args...>::value, "");
|
|
|
|
|
|
|
|
/* constexpr functions can't return void in C++11 (N3444). */
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Check the array_view<T>(PTR, SIZE) ctor, when T is a pointer. */
|
|
|
|
|
2019-11-27 01:12:03 +08:00
|
|
|
static void
|
2017-09-05 00:10:12 +08:00
|
|
|
check_ptr_size_ctor2 ()
|
|
|
|
{
|
|
|
|
struct A {};
|
|
|
|
A an_a;
|
|
|
|
|
|
|
|
A *array[] = { &an_a };
|
|
|
|
const A * const carray[] = { &an_a };
|
|
|
|
|
|
|
|
gdb::array_view<A *> v1 = {array, ARRAY_SIZE (array)};
|
|
|
|
gdb::array_view<A *> v2 = {array, (char) ARRAY_SIZE (array)};
|
|
|
|
gdb::array_view<A * const> v3 = {array, ARRAY_SIZE (array)};
|
|
|
|
gdb::array_view<const A * const> cv1 = {carray, ARRAY_SIZE (carray)};
|
|
|
|
|
|
|
|
require_not_constructible<gdb::array_view<A *>, decltype (carray), size_t> ();
|
|
|
|
|
|
|
|
SELF_CHECK (v1[0] == array[0]);
|
|
|
|
SELF_CHECK (v2[0] == array[0]);
|
|
|
|
SELF_CHECK (v3[0] == array[0]);
|
|
|
|
|
|
|
|
SELF_CHECK (!v1.empty ());
|
|
|
|
SELF_CHECK (v1.size () == 1);
|
|
|
|
SELF_CHECK (v1.data () == &array[0]);
|
|
|
|
|
|
|
|
SELF_CHECK (cv1[0] == carray[0]);
|
|
|
|
|
|
|
|
SELF_CHECK (!cv1.empty ());
|
|
|
|
SELF_CHECK (cv1.size () == 1);
|
|
|
|
SELF_CHECK (cv1.data () == &carray[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check construction with a pair of pointers. This is a template in
|
|
|
|
order to test both gdb_byte and const gdb_byte. */
|
|
|
|
|
|
|
|
template<typename T>
|
|
|
|
static void
|
|
|
|
check_ptr_ptr_ctor ()
|
|
|
|
{
|
|
|
|
T data[] = {0x11, 0x22, 0x33, 0x44};
|
|
|
|
|
|
|
|
gdb::array_view<T> view (data + 1, data + 3);
|
|
|
|
|
|
|
|
SELF_CHECK (!view.empty ());
|
|
|
|
SELF_CHECK (view.size () == 2);
|
|
|
|
SELF_CHECK (view.data () == &data[1]);
|
|
|
|
SELF_CHECK (view[0] == data[1]);
|
|
|
|
SELF_CHECK (view[1] == data[2]);
|
|
|
|
|
|
|
|
gdb_byte array[] = {0x11, 0x22, 0x33, 0x44};
|
|
|
|
const gdb_byte *p1 = array;
|
|
|
|
gdb_byte *p2 = array + ARRAY_SIZE (array);
|
|
|
|
gdb::array_view<const gdb_byte> view2 (p1, p2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check construction with a pair of pointers of mixed constness. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
check_ptr_ptr_mixed_cv ()
|
|
|
|
{
|
|
|
|
gdb_byte array[] = {0x11, 0x22, 0x33, 0x44};
|
|
|
|
const gdb_byte *cp = array;
|
|
|
|
gdb_byte *p = array;
|
|
|
|
gdb::array_view<const gdb_byte> view1 (cp, p);
|
|
|
|
gdb::array_view<const gdb_byte> view2 (p, cp);
|
|
|
|
SELF_CHECK (view1.empty ());
|
|
|
|
SELF_CHECK (view2.empty ());
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check range-for support (i.e., begin()/end()). This is a template
|
|
|
|
in order to test both gdb_byte and const gdb_byte. */
|
|
|
|
|
|
|
|
template<typename T>
|
|
|
|
static void
|
|
|
|
check_range_for ()
|
|
|
|
{
|
|
|
|
T data[] = {1, 2, 3, 4};
|
|
|
|
gdb::array_view<T> view (data);
|
|
|
|
|
|
|
|
typename std::decay<T>::type sum = 0;
|
|
|
|
for (auto &elem : view)
|
|
|
|
sum += elem;
|
|
|
|
SELF_CHECK (sum == 1 + 2 + 3 + 4);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Entry point. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
run_tests ()
|
|
|
|
{
|
|
|
|
/* Empty views. */
|
|
|
|
{
|
|
|
|
constexpr gdb::array_view<gdb_byte> view1;
|
|
|
|
constexpr gdb::array_view<const gdb_byte> view2;
|
|
|
|
|
|
|
|
static_assert (view1.empty (), "");
|
|
|
|
static_assert (view1.data () == nullptr, "");
|
|
|
|
static_assert (view1.size () == 0, "");
|
|
|
|
static_assert (view2.empty (), "");
|
|
|
|
static_assert (view2.size () == 0, "");
|
|
|
|
static_assert (view2.data () == nullptr, "");
|
|
|
|
}
|
|
|
|
|
|
|
|
std::vector<gdb_byte> vec = {0x11, 0x22, 0x33, 0x44 };
|
|
|
|
std::array<gdb_byte, 4> array = {{0x11, 0x22, 0x33, 0x44}};
|
|
|
|
|
|
|
|
/* Various tests of views over std::vector. */
|
|
|
|
{
|
|
|
|
gdb::array_view<gdb_byte> view = vec;
|
|
|
|
SELF_CHECK (check_container_view (view, vec));
|
|
|
|
gdb::array_view<const gdb_byte> cview = vec;
|
|
|
|
SELF_CHECK (check_container_view (cview, vec));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Likewise, over std::array. */
|
|
|
|
{
|
|
|
|
gdb::array_view<gdb_byte> view = array;
|
|
|
|
SELF_CHECK (check_container_view (view, array));
|
|
|
|
gdb::array_view<gdb_byte> cview = array;
|
|
|
|
SELF_CHECK (check_container_view (cview, array));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* op=(std::vector/std::array/elem) */
|
|
|
|
{
|
|
|
|
gdb::array_view<gdb_byte> view;
|
|
|
|
|
|
|
|
view = vec;
|
|
|
|
SELF_CHECK (check_container_view (view, vec));
|
|
|
|
view = std::move (vec);
|
|
|
|
SELF_CHECK (check_container_view (view, vec));
|
|
|
|
|
|
|
|
view = array;
|
|
|
|
SELF_CHECK (check_container_view (view, array));
|
|
|
|
view = std::move (array);
|
|
|
|
SELF_CHECK (check_container_view (view, array));
|
|
|
|
|
|
|
|
gdb_byte elem = 0;
|
|
|
|
view = elem;
|
|
|
|
SELF_CHECK (check_elem_view (view, elem));
|
|
|
|
view = std::move (elem);
|
|
|
|
SELF_CHECK (check_elem_view (view, elem));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test copy/move ctor and mutable->immutable conversion. */
|
|
|
|
{
|
|
|
|
gdb_byte data[] = {0x11, 0x22, 0x33, 0x44};
|
|
|
|
gdb::array_view<gdb_byte> view1 = data;
|
|
|
|
gdb::array_view<gdb_byte> view2 = view1;
|
|
|
|
gdb::array_view<gdb_byte> view3 = std::move (view1);
|
|
|
|
gdb::array_view<const gdb_byte> cview1 = data;
|
|
|
|
gdb::array_view<const gdb_byte> cview2 = cview1;
|
|
|
|
gdb::array_view<const gdb_byte> cview3 = std::move (cview1);
|
|
|
|
SELF_CHECK (view1[0] == data[0]);
|
|
|
|
SELF_CHECK (view2[0] == data[0]);
|
|
|
|
SELF_CHECK (view3[0] == data[0]);
|
|
|
|
SELF_CHECK (cview1[0] == data[0]);
|
|
|
|
SELF_CHECK (cview2[0] == data[0]);
|
|
|
|
SELF_CHECK (cview3[0] == data[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Same, but op=(view). */
|
|
|
|
{
|
|
|
|
gdb_byte data[] = {0x55, 0x66, 0x77, 0x88};
|
|
|
|
gdb::array_view<gdb_byte> view1;
|
|
|
|
gdb::array_view<gdb_byte> view2;
|
|
|
|
gdb::array_view<gdb_byte> view3;
|
|
|
|
gdb::array_view<const gdb_byte> cview1;
|
|
|
|
gdb::array_view<const gdb_byte> cview2;
|
|
|
|
gdb::array_view<const gdb_byte> cview3;
|
|
|
|
|
|
|
|
view1 = data;
|
|
|
|
view2 = view1;
|
|
|
|
view3 = std::move (view1);
|
|
|
|
cview1 = data;
|
|
|
|
cview2 = cview1;
|
|
|
|
cview3 = std::move (cview1);
|
|
|
|
SELF_CHECK (view1[0] == data[0]);
|
|
|
|
SELF_CHECK (view2[0] == data[0]);
|
|
|
|
SELF_CHECK (view3[0] == data[0]);
|
|
|
|
SELF_CHECK (cview1[0] == data[0]);
|
|
|
|
SELF_CHECK (cview2[0] == data[0]);
|
|
|
|
SELF_CHECK (cview3[0] == data[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* op[] */
|
|
|
|
{
|
2018-04-22 06:16:27 +08:00
|
|
|
std::vector<gdb_byte> vec2 = {0x11, 0x22};
|
|
|
|
gdb::array_view<gdb_byte> view = vec2;
|
|
|
|
gdb::array_view<const gdb_byte> cview = vec2;
|
2017-09-05 00:10:12 +08:00
|
|
|
|
|
|
|
/* Check that op[] on a non-const view of non-const T returns a
|
|
|
|
mutable reference. */
|
|
|
|
view[0] = 0x33;
|
2018-04-22 06:16:27 +08:00
|
|
|
SELF_CHECK (vec2[0] == 0x33);
|
2017-09-05 00:10:12 +08:00
|
|
|
|
|
|
|
/* OTOH, check that assigning through op[] on a view of const T
|
|
|
|
wouldn't compile. */
|
|
|
|
SELF_CHECK (!check_op_subscript (cview));
|
|
|
|
/* For completeness. */
|
|
|
|
SELF_CHECK (check_op_subscript (view));
|
|
|
|
}
|
|
|
|
|
|
|
|
check_ptr_size_ctor<const gdb_byte> ();
|
|
|
|
check_ptr_size_ctor<gdb_byte> ();
|
|
|
|
check_ptr_size_ctor2 ();
|
|
|
|
check_ptr_ptr_ctor<const gdb_byte> ();
|
|
|
|
check_ptr_ptr_ctor<gdb_byte> ();
|
|
|
|
check_ptr_ptr_mixed_cv ();
|
|
|
|
|
|
|
|
check_range_for<gdb_byte> ();
|
|
|
|
check_range_for<const gdb_byte> ();
|
|
|
|
|
|
|
|
/* Check that the right ctor overloads are taken when the element is
|
|
|
|
a container. */
|
|
|
|
{
|
|
|
|
using Vec = std::vector<gdb_byte>;
|
|
|
|
Vec vecs[3];
|
|
|
|
|
|
|
|
gdb::array_view<Vec> view_array = vecs;
|
|
|
|
SELF_CHECK (view_array.size () == 3);
|
|
|
|
|
|
|
|
Vec elem;
|
|
|
|
gdb::array_view<Vec> view_elem = elem;
|
|
|
|
SELF_CHECK (view_elem.size () == 1);
|
|
|
|
}
|
Use gdb:array_view in call_function_by_hand & friends
This replaces a few uses of pointer+length with gdb::array_view, in
call_function_by_hand and related code.
Unfortunately, due to -Wnarrowing, there are places where we can't
brace-initialize an gdb::array_view without an ugly-ish cast. To
avoid the cast, this patch introduces a gdb::make_array_view function.
Unit tests included.
This patch in isolation may not look so interesting, due to
gdb::make_array_view uses, but I think it's still worth it. Some of
the gdb::make_array_view calls disappear down the series, and others
could be eliminated with more (non-trivial) gdb::array_view
detangling/conversion (e.g. code around eval_call). See this as a "we
have to start somewhere" patch.
gdb/ChangeLog:
2018-11-21 Pedro Alves <palves@redhat.com>
* ada-lang.c (ada_evaluate_subexp): Adjust to pass an array_view.
* common/array-view.h (make_array_view): New.
* compile/compile-object-run.c (compile_object_run): Adjust to
pass an array_view.
* elfread.c (elf_gnu_ifunc_resolve_addr): Adjust.
* eval.c (eval_call): Adjust to pass an array_view.
(evaluate_subexp_standard): Adjust to pass an array_view.
* gcore.c (call_target_sbrk): Adjust to pass an array_view.
* guile/scm-value.c (gdbscm_value_call): Likewise.
* infcall.c (push_dummy_code): Replace pointer + size parameters
with an array_view parameter.
(call_function_by_hand, call_function_by_hand_dummy): Likewise and
adjust.
* infcall.h: Include "common/array-view.h".
(call_function_by_hand, call_function_by_hand_dummy): Replace
pointer + size parameters with an array_view parameter.
* linux-fork.c (inferior_call_waitpid): Adjust to use array_view.
* linux-tdep.c (linux_infcall_mmap): Likewise.
* objc-lang.c (lookup_objc_class, lookup_child_selector)
(value_nsstring, print_object_command): Likewise.
* python/py-value.c (valpy_call): Likewise.
* rust-lang.c (rust_evaluate_funcall): Likewise.
* spu-tdep.c (flush_ea_cache): Likewise.
* valarith.c (value_x_binop, value_x_unop): Likewise.
* valops.c (value_allocate_space_in_inferior): Likewise.
* unittests/array-view-selftests.c (run_tests): Add
gdb::make_array_view test.
2018-11-21 19:55:11 +08:00
|
|
|
|
|
|
|
/* gdb::make_array_view, int length. */
|
|
|
|
{
|
|
|
|
gdb_byte data[] = {0x55, 0x66, 0x77, 0x88};
|
|
|
|
int len = sizeof (data) / sizeof (data[0]);
|
|
|
|
auto view = gdb::make_array_view (data, len);
|
|
|
|
|
|
|
|
SELF_CHECK (view.data () == data);
|
|
|
|
SELF_CHECK (view.size () == len);
|
|
|
|
|
|
|
|
for (size_t i = 0; i < len; i++)
|
|
|
|
SELF_CHECK (view[i] == data[i]);
|
|
|
|
}
|
invoke_xmethod & array_view
This replaces more pointer+length with gdb::array_view. This time,
around invoke_xmethod, and then propagating the fallout around, which
inevitably leaks to the overload resolution code.
There are several places in the code that want to grab a slice of an
array, by advancing the array pointer, and decreasing the length
pointer. This patch introduces a pair of new
gdb::array_view::slice(...) methods to make that convenient and clear.
Unit test included.
gdb/ChangeLog:
2018-11-21 Pedro Alves <palves@redhat.com>
* common/array-view.h (array_view::splice(size_type, size_t)): New.
(array_view::splice(size_type)): New.
* eval.c (eval_call, evaluate_funcall): Adjust to use array_view.
* extension.c (xmethod_worker::get_arg_types): Adjust to return an
std::vector.
(xmethod_worker::get_result_type): Adjust to use gdb::array_view.
* extension.h: Include "common/array-view.h".
(xmethod_worker::invoke): Adjust to use gdb::array_view.
(xmethod_worker::get_arg_types): Adjust to return an std::vector.
(xmethod_worker::get_result_type): Adjust to use gdb::array_view.
(xmethod_worker::do_get_arg_types): Adjust to use std::vector.
(xmethod_worker::do_get_result_type): Adjust to use
gdb::array_view.
* gdbtypes.c (rank_function): Adjust to use gdb::array_view.
* gdbtypes.h: Include "common/array-view.h".
(rank_function): Adjust to use gdb::array_view.
* python/py-xmethods.c (python_xmethod_worker::invoke)
(python_xmethod_worker::do_get_arg_types)
(python_xmethod_worker::do_get_result_type)
(python_xmethod_worker::invoke): Adjust to new interfaces.
* valarith.c (value_user_defined_cpp_op, value_user_defined_op)
(value_x_binop, value_x_unop): Adjust to use gdb::array_view.
* valops.c (find_overload_match, find_oload_champ_namespace)
(find_oload_champ_namespace_loop, find_oload_champ): Adjust to use
gdb:array_view and the new xmethod_worker interfaces.
* value.c (result_type_of_xmethod, call_xmethod): Adjust to use
gdb::array_view.
* value.h (find_overload_match, result_type_of_xmethod)
(call_xmethod): Adjust to use gdb::array_view.
* unittests/array-view-selftests.c: Add slicing tests.
2018-11-21 19:55:12 +08:00
|
|
|
|
|
|
|
/* Test slicing. */
|
|
|
|
{
|
|
|
|
gdb_byte data[] = {0x55, 0x66, 0x77, 0x88, 0x99};
|
|
|
|
gdb::array_view<gdb_byte> view = data;
|
|
|
|
|
|
|
|
{
|
|
|
|
auto slc = view.slice (1, 3);
|
|
|
|
SELF_CHECK (slc.data () == data + 1);
|
|
|
|
SELF_CHECK (slc.size () == 3);
|
|
|
|
SELF_CHECK (slc[0] == data[1]);
|
|
|
|
SELF_CHECK (slc[0] == view[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
auto slc = view.slice (2);
|
|
|
|
SELF_CHECK (slc.data () == data + 2);
|
|
|
|
SELF_CHECK (slc.size () == 3);
|
|
|
|
SELF_CHECK (slc[0] == view[2]);
|
|
|
|
SELF_CHECK (slc[0] == data[2]);
|
|
|
|
}
|
|
|
|
}
|
2017-09-05 00:10:12 +08:00
|
|
|
}
|
|
|
|
|
gdbsupport: add array_view copy function
An assertion was recently added to array_view::operator[] to ensure we
don't do out of bounds accesses. However, when the array_view is copied
to or from using memcpy, it bypasses that safety.
To address this, add a `copy` free function that copies data from an
array view to another, ensuring that the destination and source array
views have the same size. When copying to or from parts of an
array_view, we are expected to use gdb::array_view::slice, which does
its own bounds check. With all that, any copy operation that goes out
of bounds should be caught by an assertion at runtime.
copy is implemented using std::copy and std::copy_backward, which, at
least on libstdc++, appears to pick memmove when copying trivial data.
So in the end there shouldn't be much difference vs using a bare memcpy,
as we do right now. When copying non-trivial data, std::copy and
std::copy_backward assigns each element in a loop.
To properly support overlapping ranges, we must use std::copy or
std::copy_backward, depending on whether the destination is before the
source or vice-versa. std::copy and std::copy_backward don't support
copying exactly overlapping ranges (where the source range is equal to
the destination range). But in this case, no copy is needed anyway, so
we do nothing.
The order of parameters of the new copy function is based on std::copy
and std::copy_backward, where the source comes before the destination.
Change a few randomly selected spots to use the new function, to show
how it can be used.
Add a test for the new function, testing both with arrays of a trivial
type (int) and of a non-trivial type (foo). Test non-overlapping
ranges as well as three kinds of overlapping ranges: source before dest,
dest before source, and dest == source.
Change-Id: Ibeaca04e0028410fd44ce82f72e60058d6230a03
2021-11-09 05:06:07 +08:00
|
|
|
template <typename T>
|
|
|
|
void
|
|
|
|
run_copy_test ()
|
|
|
|
{
|
|
|
|
/* Test non-overlapping copy. */
|
|
|
|
{
|
|
|
|
const std::vector<T> src_v = {1, 2, 3, 4};
|
|
|
|
std::vector<T> dest_v (4, -1);
|
|
|
|
|
|
|
|
SELF_CHECK (dest_v != src_v);
|
|
|
|
copy (gdb::array_view<const T> (src_v), gdb::array_view<T> (dest_v));
|
|
|
|
SELF_CHECK (dest_v == src_v);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test overlapping copy, where the source is before the destination. */
|
|
|
|
{
|
|
|
|
std::vector<T> vec = {1, 2, 3, 4, 5, 6, 7, 8};
|
|
|
|
gdb::array_view<T> v = vec;
|
|
|
|
|
|
|
|
copy (v.slice (1, 4),
|
|
|
|
v.slice (2, 4));
|
|
|
|
|
|
|
|
std::vector<T> expected = {1, 2, 2, 3, 4, 5, 7, 8};
|
|
|
|
SELF_CHECK (vec == expected);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test overlapping copy, where the source is after the destination. */
|
|
|
|
{
|
|
|
|
std::vector<T> vec = {1, 2, 3, 4, 5, 6, 7, 8};
|
|
|
|
gdb::array_view<T> v = vec;
|
|
|
|
|
|
|
|
copy (v.slice (2, 4),
|
|
|
|
v.slice (1, 4));
|
|
|
|
|
|
|
|
std::vector<T> expected = {1, 3, 4, 5, 6, 6, 7, 8};
|
|
|
|
SELF_CHECK (vec == expected);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test overlapping copy, where the source is the same as the destination. */
|
|
|
|
{
|
|
|
|
std::vector<T> vec = {1, 2, 3, 4, 5, 6, 7, 8};
|
|
|
|
gdb::array_view<T> v = vec;
|
|
|
|
|
|
|
|
copy (v.slice (2, 4),
|
|
|
|
v.slice (2, 4));
|
|
|
|
|
|
|
|
std::vector<T> expected = {1, 2, 3, 4, 5, 6, 7, 8};
|
|
|
|
SELF_CHECK (vec == expected);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Class with a non-trivial copy assignment operator, used to test the
|
|
|
|
array_view copy function. */
|
|
|
|
struct foo
|
|
|
|
{
|
|
|
|
/* Can be implicitly constructed from an int, such that we can use the same
|
|
|
|
templated test function to test against array_view<int> and
|
|
|
|
array_view<foo>. */
|
|
|
|
foo (int n)
|
|
|
|
: n (n)
|
|
|
|
{}
|
|
|
|
|
|
|
|
/* Needed to avoid -Wdeprecated-copy-with-user-provided-copy error with
|
|
|
|
Clang. */
|
|
|
|
foo (const foo &other) = default;
|
|
|
|
|
|
|
|
void operator= (const foo &other)
|
|
|
|
{
|
|
|
|
this->n = other.n;
|
|
|
|
this->n_assign_op_called++;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool operator==(const foo &other) const
|
|
|
|
{
|
|
|
|
return this->n == other.n;
|
|
|
|
}
|
|
|
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
/* Number of times the assignment operator has been called. */
|
|
|
|
static int n_assign_op_called;
|
|
|
|
};
|
|
|
|
|
|
|
|
int foo::n_assign_op_called = 0;
|
|
|
|
|
|
|
|
/* Test the array_view copy free function. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
run_copy_tests ()
|
|
|
|
{
|
|
|
|
/* Test with a trivial type. */
|
|
|
|
run_copy_test<int> ();
|
|
|
|
|
|
|
|
/* Test with a non-trivial type. */
|
|
|
|
foo::n_assign_op_called = 0;
|
|
|
|
run_copy_test<foo> ();
|
|
|
|
|
|
|
|
/* Make sure that for the non-trivial type foo, the assignment operator was
|
|
|
|
called an amount of times that makes sense. */
|
|
|
|
SELF_CHECK (foo::n_assign_op_called == 12);
|
|
|
|
}
|
|
|
|
|
2017-09-05 00:10:12 +08:00
|
|
|
} /* namespace array_view_tests */
|
|
|
|
} /* namespace selftests */
|
|
|
|
|
2020-01-14 03:01:38 +08:00
|
|
|
void _initialize_array_view_selftests ();
|
2017-09-05 00:10:12 +08:00
|
|
|
void
|
|
|
|
_initialize_array_view_selftests ()
|
|
|
|
{
|
Add selftests run filtering
With the growing number of selftests, I think it would be useful to be
able to run only a subset of the tests. This patch associates a name to
each registered selftest. It then allows doing something like:
(gdb) maintenance selftest aarch64
Running self-tests.
Running selftest aarch64-analyze-prologue.
Running selftest aarch64-process-record.
Ran 2 unit tests, 0 failed
or with gdbserver:
./gdbserver --selftest=aarch64
In both cases, only the tests that contain "aarch64" in their name are
ran. To help validate that the tests you want to run were actually ran,
it also prints a message with the test name before running each test.
Right now, all the arch-dependent tests are registered as a single test
of the selftests. To be able to filter those too, I made them
"first-class citizen" selftests. The selftest type is an interface,
with different implementations for "simple selftests" and "arch
selftests". The run_tests function simply iterates on that an invokes
operator() on each test.
I changed the tests data structure from a vector to a map, because
- it allows iterating in a stable (alphabetical) order
- it allows to easily verify if a test with a given name has been
registered, to avoid duplicates
There's also a new command "maintenance info selftests" that lists the
registered selftests.
gdb/ChangeLog:
* common/selftest.h (selftest): New struct/interface.
(register_test): Add name parameter, add new overload.
(run_tests): Add filter parameter.
(for_each_selftest_ftype): New typedef.
(for_each_selftest): New declaration.
* common/selftest.c (tests): Change type to
map<string, unique_ptr<selftest>>.
(simple_selftest): New struct.
(register_test): New function.
(register_test): Add name parameter and use it.
(run_tests): Add filter parameter and use it. Add prints.
Adjust to vector -> map change.
* aarch64-tdep.c (_initialize_aarch64_tdep): Add names when
registering selftests.
* arm-tdep.c (_initialize_arm_tdep): Likewise.
* disasm-selftests.c (_initialize_disasm_selftests): Likewise.
* dwarf2-frame.c (_initialize_dwarf2_frame): Likewise.
* dwarf2loc.c (_initialize_dwarf2loc): Likewise.
* findvar.c (_initialize_findvar): Likewise.
* gdbarch-selftests.c (_initialize_gdbarch_selftests): Likewise.
* maint.c (maintenance_selftest): Update call to run_tests.
(maintenance_info_selftests): New function.
(_initialize_maint_cmds): Register "maintenance info selftests"
command. Update "maintenance selftest" doc.
* regcache.c (_initialize_regcache): Add names when registering
selftests.
* rust-exp.y (_initialize_rust_exp): Likewise.
* selftest-arch.c (gdbarch_selftest): New struct.
(gdbarch_tests): Remove.
(register_test_foreach_arch): Add name parameter. Call
register_test.
(tests_with_arch): Remove, move most content to
gdbarch_selftest::operator().
(_initialize_selftests_foreach_arch): Remove.
* selftest-arch.h (register_test_foreach_arch): Add name
parameter.
(run_tests_with_arch): New declaration.
* utils-selftests.c (_initialize_utils_selftests): Add names
when registering selftests.
* utils.c (_initialize_utils): Likewise.
* unittests/array-view-selftests.c
(_initialize_array_view_selftests): Likewise.
* unittests/environ-selftests.c (_initialize_environ_selftests):
Likewise.
* unittests/function-view-selftests.c
(_initialize_function_view_selftests): Likewise.
* unittests/offset-type-selftests.c
(_initialize_offset_type_selftests): Likewise.
* unittests/optional-selftests.c
(_initialize_optional_selftests): Likewise.
* unittests/scoped_restore-selftests.c
(_initialize_scoped_restore_selftests): Likewise.
* NEWS: Document "maintenance selftest" and "maint info
selftests".
gdb/gdbserver/ChangeLog:
* server.c (captured_main): Accept argument for --selftest.
Update run_tests call.
* linux-x86-tdesc-selftest.c (initialize_low_tdesc): Add names
when registering selftests.
gdb/doc/ChangeLog:
* gdb.texinfo (Maintenance Commands): Document filter parameter
of "maint selftest". Document "maint info selftests" command.
2017-09-16 20:06:03 +08:00
|
|
|
selftests::register_test ("array_view",
|
|
|
|
selftests::array_view_tests::run_tests);
|
gdbsupport: add array_view copy function
An assertion was recently added to array_view::operator[] to ensure we
don't do out of bounds accesses. However, when the array_view is copied
to or from using memcpy, it bypasses that safety.
To address this, add a `copy` free function that copies data from an
array view to another, ensuring that the destination and source array
views have the same size. When copying to or from parts of an
array_view, we are expected to use gdb::array_view::slice, which does
its own bounds check. With all that, any copy operation that goes out
of bounds should be caught by an assertion at runtime.
copy is implemented using std::copy and std::copy_backward, which, at
least on libstdc++, appears to pick memmove when copying trivial data.
So in the end there shouldn't be much difference vs using a bare memcpy,
as we do right now. When copying non-trivial data, std::copy and
std::copy_backward assigns each element in a loop.
To properly support overlapping ranges, we must use std::copy or
std::copy_backward, depending on whether the destination is before the
source or vice-versa. std::copy and std::copy_backward don't support
copying exactly overlapping ranges (where the source range is equal to
the destination range). But in this case, no copy is needed anyway, so
we do nothing.
The order of parameters of the new copy function is based on std::copy
and std::copy_backward, where the source comes before the destination.
Change a few randomly selected spots to use the new function, to show
how it can be used.
Add a test for the new function, testing both with arrays of a trivial
type (int) and of a non-trivial type (foo). Test non-overlapping
ranges as well as three kinds of overlapping ranges: source before dest,
dest before source, and dest == source.
Change-Id: Ibeaca04e0028410fd44ce82f72e60058d6230a03
2021-11-09 05:06:07 +08:00
|
|
|
selftests::register_test ("array_view-copy",
|
|
|
|
selftests::array_view_tests::run_copy_tests);
|
2017-09-05 00:10:12 +08:00
|
|
|
}
|