Skip to content

R
riscv-gcc-1
Commit fa5cc2db by François Dumont
Options

formatter.h (_GLIBCXX_TYPEID): New macro to simplify usage of typeid. 

2015-05-20  François Dumont  <fdumont@gcc.gnu.org>

	* include/debug/formatter.h (_GLIBCXX_TYPEID): New macro to simplify
	usage of typeid.
	(_Error_formatter::_M_print_type): New.
	* src/c++11/debug.cc
	(_Error_formatter::_Parameter::_M_print_field): Use latter.
	(_Error_formatter::_M_print_type): Implement latter using
	__cxaabiv1::__cxa_demangle to print demangled type name.

From-SVN: r223455
parent 1476d1bd
Showing with 83 additions and 95 deletions
libstdc++-v3/ChangeLog
2015-05-20 François Dumont <fdumont@gcc.gnu.org> 2015-05-20 François Dumont <fdumont@gcc.gnu.org>
* include/debug/formatter.h (_GLIBCXX_TYPEID): New macro to simplify
usage of typeid.
(_Error_formatter::_M_print_type): New.
* src/c++11/debug.cc
(_Error_formatter::_Parameter::_M_print_field): Use latter.
(_Error_formatter::_M_print_type): Implement latter using
__cxaabiv1::__cxa_demangle to print demangled type name.
* include/bits/cpp_type_traits.h * include/bits/cpp_type_traits.h
(std::move_iterator): Delete declaration. (std::move_iterator): Delete declaration.
(std::__is_move_iterator<move_iterator>): Move partial specialization... (std::__is_move_iterator<move_iterator>): Move partial specialization...
......
libstdc++-v3/include/debug/formatter.h
...@@ -31,7 +31,17 @@ ...@@ -31,7 +31,17 @@
#include <bits/c++config.h> #include <bits/c++config.h>
#include <bits/cpp_type_traits.h> #include <bits/cpp_type_traits.h>
#include <typeinfo>
#if __cpp_rtti
# include <typeinfo>
# define _GLIBCXX_TYPEID(_Type) &typeid(_Type)
#else
namespace std
{
class type_info;
}
# define _GLIBCXX_TYPEID(_Type) 0
#endif
namespace __gnu_debug namespace __gnu_debug
{ {
...@@ -134,11 +144,11 @@ namespace __gnu_debug ...@@ -134,11 +144,11 @@ namespace __gnu_debug
enum _Iterator_state enum _Iterator_state
{ {
__unknown_state, __unknown_state,
__singular, // singular, may still be attached to a sequence __singular, // singular, may still be attached to a sequence
__begin, // dereferenceable, and at the beginning __begin, // dereferenceable, and at the beginning
__middle, // dereferenceable, not at the beginning __middle, // dereferenceable, not at the beginning
__end, // past-the-end, may be at beginning if sequence empty __end, // past-the-end, may be at beginning if sequence empty
__before_begin, // before begin __before_begin, // before begin
__last_state __last_state
}; };
...@@ -163,48 +173,48 @@ namespace __gnu_debug ...@@ -163,48 +173,48 @@ namespace __gnu_debug
// When _M_kind == __iterator // When _M_kind == __iterator
struct struct
{ {
const char* _M_name; const char* _M_name;
const void* _M_address; const void* _M_address;
const type_info* _M_type; const type_info* _M_type;
_Constness _M_constness; _Constness _M_constness;
_Iterator_state _M_state; _Iterator_state _M_state;
const void* _M_sequence; const void* _M_sequence;
const type_info* _M_seq_type; const type_info* _M_seq_type;
} _M_iterator; } _M_iterator;
// When _M_kind == __sequence // When _M_kind == __sequence
struct struct
{ {
const char* _M_name; const char* _M_name;
const void* _M_address; const void* _M_address;
const type_info* _M_type; const type_info* _M_type;
} _M_sequence; } _M_sequence;
// When _M_kind == __integer // When _M_kind == __integer
struct struct
{ {
const char* _M_name; const char* _M_name;
long _M_value; long _M_value;
} _M_integer; } _M_integer;
// When _M_kind == __string // When _M_kind == __string
struct struct
{ {
const char* _M_name; const char* _M_name;
const char* _M_value; const char* _M_value;
} _M_string; } _M_string;
} _M_variant; } _M_variant;
_Parameter() : _M_kind(__unused_param), _M_variant() { } _Parameter() : _M_kind(__unused_param), _M_variant() { }
_Parameter(long __value, const char* __name) _Parameter(long __value, const char* __name)
: _M_kind(__integer), _M_variant() : _M_kind(__integer), _M_variant()
{ {
_M_variant._M_integer._M_name = __name; _M_variant._M_integer._M_name = __name;
_M_variant._M_integer._M_value = __value; _M_variant._M_integer._M_value = __value;
} }
_Parameter(const char* __value, const char* __name) _Parameter(const char* __value, const char* __name)
: _M_kind(__string), _M_variant() : _M_kind(__string), _M_variant()
{ {
_M_variant._M_string._M_name = __name; _M_variant._M_string._M_name = __name;
...@@ -212,27 +222,19 @@ namespace __gnu_debug ...@@ -212,27 +222,19 @@ namespace __gnu_debug
} }
template<typename _Iterator, typename _Sequence> template<typename _Iterator, typename _Sequence>
_Parameter(const _Safe_iterator<_Iterator, _Sequence>& __it, _Parameter(const _Safe_iterator<_Iterator, _Sequence>& __it,
const char* __name, _Is_iterator) const char* __name, _Is_iterator)
: _M_kind(__iterator), _M_variant() : _M_kind(__iterator), _M_variant()
{ {
_M_variant._M_iterator._M_name = __name; _M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it; _M_variant._M_iterator._M_address = &__it;
#if __cpp_rtti _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
#endif
_M_variant._M_iterator._M_constness = _M_variant._M_iterator._M_constness =
std::__are_same<_Safe_iterator<_Iterator, _Sequence>, std::__are_same<_Safe_iterator<_Iterator, _Sequence>,
typename _Sequence::iterator>:: typename _Sequence::iterator>::
__value ? __mutable_iterator : __const_iterator; __value ? __mutable_iterator : __const_iterator;
_M_variant._M_iterator._M_sequence = __it._M_get_sequence(); _M_variant._M_iterator._M_sequence = __it._M_get_sequence();
#if __cpp_rtti _M_variant._M_iterator._M_seq_type = _GLIBCXX_TYPEID(_Sequence);
_M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
#else
_M_variant._M_iterator._M_seq_type = 0;
#endif
if (__it._M_singular()) if (__it._M_singular())
_M_variant._M_iterator._M_state = __singular; _M_variant._M_iterator._M_state = __singular;
...@@ -256,21 +258,13 @@ namespace __gnu_debug ...@@ -256,21 +258,13 @@ namespace __gnu_debug
{ {
_M_variant._M_iterator._M_name = __name; _M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it; _M_variant._M_iterator._M_address = &__it;
#if __cpp_rtti _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
#endif
_M_variant._M_iterator._M_constness = _M_variant._M_iterator._M_constness =
std::__are_same<_Safe_local_iterator<_Iterator, _Sequence>, std::__are_same<_Safe_local_iterator<_Iterator, _Sequence>,
typename _Sequence::local_iterator>:: typename _Sequence::local_iterator>::
__value ? __mutable_iterator : __const_iterator; __value ? __mutable_iterator : __const_iterator;
_M_variant._M_iterator._M_sequence = __it._M_get_sequence(); _M_variant._M_iterator._M_sequence = __it._M_get_sequence();
#if __cpp_rtti _M_variant._M_iterator._M_seq_type = _GLIBCXX_TYPEID(_Sequence);
_M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
#else
_M_variant._M_iterator._M_seq_type = 0;
#endif
if (__it._M_singular()) if (__it._M_singular())
_M_variant._M_iterator._M_state = __singular; _M_variant._M_iterator._M_state = __singular;
...@@ -286,16 +280,12 @@ namespace __gnu_debug ...@@ -286,16 +280,12 @@ namespace __gnu_debug
} }
template<typename _Type> template<typename _Type>
_Parameter(const _Type*& __it, const char* __name, _Is_iterator) _Parameter(const _Type*& __it, const char* __name, _Is_iterator)
: _M_kind(__iterator), _M_variant() : _M_kind(__iterator), _M_variant()
{ {
_M_variant._M_iterator._M_name = __name; _M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it; _M_variant._M_iterator._M_address = &__it;
#if __cpp_rtti _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
#endif
_M_variant._M_iterator._M_constness = __mutable_iterator; _M_variant._M_iterator._M_constness = __mutable_iterator;
_M_variant._M_iterator._M_state = __it? __unknown_state : __singular; _M_variant._M_iterator._M_state = __it? __unknown_state : __singular;
_M_variant._M_iterator._M_sequence = 0; _M_variant._M_iterator._M_sequence = 0;
...@@ -303,16 +293,12 @@ namespace __gnu_debug ...@@ -303,16 +293,12 @@ namespace __gnu_debug
} }
template<typename _Type> template<typename _Type>
_Parameter(_Type*& __it, const char* __name, _Is_iterator) _Parameter(_Type*& __it, const char* __name, _Is_iterator)
: _M_kind(__iterator), _M_variant() : _M_kind(__iterator), _M_variant()
{ {
_M_variant._M_iterator._M_name = __name; _M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it; _M_variant._M_iterator._M_address = &__it;
#if __cpp_rtti _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
#endif
_M_variant._M_iterator._M_constness = __const_iterator; _M_variant._M_iterator._M_constness = __const_iterator;
_M_variant._M_iterator._M_state = __it? __unknown_state : __singular; _M_variant._M_iterator._M_state = __it? __unknown_state : __singular;
_M_variant._M_iterator._M_sequence = 0; _M_variant._M_iterator._M_sequence = 0;
...@@ -320,16 +306,12 @@ namespace __gnu_debug ...@@ -320,16 +306,12 @@ namespace __gnu_debug
} }
template<typename _Iterator> template<typename _Iterator>
_Parameter(const _Iterator& __it, const char* __name, _Is_iterator) _Parameter(const _Iterator& __it, const char* __name, _Is_iterator)
: _M_kind(__iterator), _M_variant() : _M_kind(__iterator), _M_variant()
{ {
_M_variant._M_iterator._M_name = __name; _M_variant._M_iterator._M_name = __name;
_M_variant._M_iterator._M_address = &__it; _M_variant._M_iterator._M_address = &__it;
#if __cpp_rtti _M_variant._M_iterator._M_type = _GLIBCXX_TYPEID(__it);
_M_variant._M_iterator._M_type = &typeid(__it);
#else
_M_variant._M_iterator._M_type = 0;
#endif
_M_variant._M_iterator._M_constness = __unknown_constness; _M_variant._M_iterator._M_constness = __unknown_constness;
_M_variant._M_iterator._M_state = _M_variant._M_iterator._M_state =
__gnu_debug::__check_singular(__it)? __singular : __unknown_state; __gnu_debug::__check_singular(__it)? __singular : __unknown_state;
...@@ -338,31 +320,23 @@ namespace __gnu_debug ...@@ -338,31 +320,23 @@ namespace __gnu_debug
} }
template<typename _Sequence> template<typename _Sequence>
_Parameter(const _Safe_sequence<_Sequence>& __seq, _Parameter(const _Safe_sequence<_Sequence>& __seq,
const char* __name, _Is_sequence) const char* __name, _Is_sequence)
: _M_kind(__sequence), _M_variant() : _M_kind(__sequence), _M_variant()
{ {
_M_variant._M_sequence._M_name = __name; _M_variant._M_sequence._M_name = __name;
_M_variant._M_sequence._M_address = _M_variant._M_sequence._M_address =
static_cast<const _Sequence*>(&__seq); static_cast<const _Sequence*>(&__seq);
#if __cpp_rtti _M_variant._M_sequence._M_type = _GLIBCXX_TYPEID(_Sequence);
_M_variant._M_sequence._M_type = &typeid(_Sequence);
#else
_M_variant._M_sequence._M_type = 0;
#endif
} }
template<typename _Sequence> template<typename _Sequence>
_Parameter(const _Sequence& __seq, const char* __name, _Is_sequence) _Parameter(const _Sequence& __seq, const char* __name, _Is_sequence)
: _M_kind(__sequence), _M_variant() : _M_kind(__sequence), _M_variant()
{ {
_M_variant._M_sequence._M_name = __name; _M_variant._M_sequence._M_name = __name;
_M_variant._M_sequence._M_address = &__seq; _M_variant._M_sequence._M_address = &__seq;
#if __cpp_rtti _M_variant._M_sequence._M_type = _GLIBCXX_TYPEID(_Sequence);
_M_variant._M_sequence._M_type = &typeid(_Sequence);
#else
_M_variant._M_sequence._M_type = 0;
#endif
} }
void void
...@@ -439,20 +413,24 @@ namespace __gnu_debug ...@@ -439,20 +413,24 @@ namespace __gnu_debug
_M_print_string(const char* __string) const; _M_print_string(const char* __string) const;
void void
_M_print_type(const type_info* __info,
const char* __unknown_name) const;
void
_M_get_max_length() const throw (); _M_get_max_length() const throw ();
enum { __max_parameters = 9 }; enum { __max_parameters = 9 };
const char* _M_file; const char* _M_file;
std::size_t _M_line; std::size_t _M_line;
mutable _Parameter _M_parameters[__max_parameters]; mutable _Parameter _M_parameters[__max_parameters];
mutable std::size_t _M_num_parameters; mutable std::size_t _M_num_parameters;
mutable const char* _M_text; mutable const char* _M_text;
mutable std::size_t _M_max_length; mutable std::size_t _M_max_length;
enum { _M_indent = 4 } ; enum { _M_indent = 4 } ;
mutable std::size_t _M_column; mutable std::size_t _M_column;
mutable bool _M_first_line; mutable bool _M_first_line;
mutable bool _M_wordwrap; mutable bool _M_wordwrap;
public: public:
static _Error_formatter static _Error_formatter
...@@ -461,4 +439,6 @@ namespace __gnu_debug ...@@ -461,4 +439,6 @@ namespace __gnu_debug
}; };
} // namespace __gnu_debug } // namespace __gnu_debug
#undef _GLIBCXX_TYPEID
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment