OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove relational operators from common/offset-type.h

Browse Source 
This patch is a follow-up of:

  https://sourceware.org/ml/gdb-patches/2018-10/msg00601.html

It removes the declaration of the relational operators for
common/offset-type.h.  As it turns out, these overloads are not being
used when a new offset type is declared, because, according to Pedro
Alves:

  I think the functions aren't called because they are templates, and
  thus the built-in (non-template) versions take precedence.  If you
  make them non-templates, then they should be called.  But, the
  built-ins are fine, so yeah, we can just remove the custom
  definitions.

The patch also adjusts the comments on the code.

No regressions introduced.

gdb/ChangeLog:
2018-10-29  Sergio Durigan Junior  <sergiodj@redhat.com>

	* common/offset-type.h (DEFINE_OFFSET_REL_OP): Delete.
	Adjust comments.
This commit is contained in:
Sergio Durigan Junior 2018-10-25 16:46:46 -04:00
parent 9c3adfb9a4
commit fd332753fa
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2018-10-29 Sergio Durigan Junior <sergiodj@redhat.com>
* common/offset-type.h (DEFINE_OFFSET_REL_OP): Delete.
Adjust comments.
2018-10-29 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* procfs.c: Include common/pathstuff.h.

18
gdb/common/offset-type.h
View File

@ -57,7 +57,7 @@
/* The macro macro is all you need to know use offset types. The rest
below is all implementation detail. */
/* For each enum class type that you want to support relational
/* For each enum class type that you want to support arithmetic
operators, declare an "is_offset_type" overload that has exactly
one parameter, of type that enum class. E.g.,:
@ -73,22 +73,6 @@
function via ADL.
*/
#define DEFINE_OFFSET_REL_OP(OP) \
template<typename E, \
typename = decltype (is_offset_type (std::declval<E> ()))> \
constexpr bool \
operator OP (E lhs, E rhs) \
{ \
using underlying = typename std::underlying_type<E>::type; \
return (static_cast<underlying> (lhs) \
OP static_cast<underlying> (lhs)); \
}
DEFINE_OFFSET_REL_OP(>)
DEFINE_OFFSET_REL_OP(>=)
DEFINE_OFFSET_REL_OP(<)
DEFINE_OFFSET_REL_OP(<=)
/* Adding or subtracting an integer to an offset type shifts the
offset. This is like "PTR = PTR + INT" and "PTR += INT". */