[PATCH] PR59161 make pretty printers always return strings
Jonathan Wakely
jwakely@redhat.com
Thu Dec 15 13:28:00 GMT 2016
As discussed in the PR, when we return a gdb.Value from a printer's
to_string() method GDB converts it to a string using a simplified
format that omits the address part of pointer/reference fields. I
think that's simply wrong, but in order to work with existing versions
of GDB we need to always convert to a string explicitly, to avoid that
simplified format. This ensures we don't print silliness like {ref = }
PR libstdc++/59161
* python/libstdcxx/v6/printers.py (StdListIteratorPrinter.to_string)
(StdSlistIteratorPrinter.to_string, StdVectorIteratorPrinter.to_string)
(StdRbtreeIteratorPrinter.to_string, StdDequeIteratorPrinter.to_string)
(StdDebugIteratorPrinter.to_string): Return string instead of
gdb.Value.
* testsuite/libstdc++-prettyprinters/59161.cc: New test.
Tested x86_64-linux, committed to trunk.
-------------- next part --------------
commit 73cddeb79a106fc7ad00a57698f797bd30738e39
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Dec 15 13:24:07 2016 +0000
PR59161 make pretty printers always return strings
PR libstdc++/59161
* python/libstdcxx/v6/printers.py (StdListIteratorPrinter.to_string)
(StdSlistIteratorPrinter.to_string, StdVectorIteratorPrinter.to_string)
(StdRbtreeIteratorPrinter.to_string, StdDequeIteratorPrinter.to_string)
(StdDebugIteratorPrinter.to_string): Return string instead of
gdb.Value.
* testsuite/libstdc++-prettyprinters/59161.cc: New test.
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 9d84b4f..ab3592a 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -203,7 +203,7 @@ class StdListIteratorPrinter:
nodetype = find_type(self.val.type, '_Node')
nodetype = nodetype.strip_typedefs().pointer()
node = self.val['_M_node'].cast(nodetype).dereference()
- return get_value_from_list_node(node)
+ return str(get_value_from_list_node(node))
class StdSlistPrinter:
"Print a __gnu_cxx::slist"
@@ -248,7 +248,7 @@ class StdSlistIteratorPrinter:
def to_string(self):
nodetype = find_type(self.val.type, '_Node')
nodetype = nodetype.strip_typedefs().pointer()
- return self.val['_M_node'].cast(nodetype).dereference()['_M_data']
+ return str(self.val['_M_node'].cast(nodetype).dereference()['_M_data'])
class StdVectorPrinter:
"Print a std::vector"
@@ -333,7 +333,7 @@ class StdVectorIteratorPrinter:
self.val = val
def to_string(self):
- return self.val['_M_current'].dereference()
+ return str(self.val['_M_current'].dereference())
class StdTuplePrinter:
"Print a std::tuple"
@@ -495,7 +495,7 @@ class StdRbtreeIteratorPrinter:
def to_string (self):
node = self.val['_M_node'].cast(self.link_type).dereference()
- return get_value_from_Rb_tree_node(node)
+ return str(get_value_from_Rb_tree_node(node))
class StdDebugIteratorPrinter:
"Print a debug enabled version of an iterator"
@@ -511,7 +511,7 @@ class StdDebugIteratorPrinter:
if not safe_seq or self.val['_M_version'] != safe_seq['_M_version']:
return "invalid iterator"
itype = self.val.type.template_argument(0)
- return self.val.cast(itype)
+ return str(self.val.cast(itype))
def num_elements(num):
"""Return either "1 element" or "N elements" depending on the argument."""
@@ -708,7 +708,7 @@ class StdDequeIteratorPrinter:
self.val = val
def to_string(self):
- return self.val['_M_cur'].dereference()
+ return str(self.val['_M_cur'].dereference())
class StdStringPrinter:
"Print a std::basic_string of some kind"
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/59161.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/59161.cc
new file mode 100644
index 0000000..d8fef27
--- /dev/null
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/59161.cc
@@ -0,0 +1,70 @@
+// { dg-do run }
+// { dg-options "-g -O0" }
+
+// Copyright (C) 2011-2016 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option)
+// any later version.
+
+// This library 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 library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <deque>
+#include <list>
+#include <ext/slist>
+#include <set>
+#include <vector>
+#include <debug/vector>
+#include <iostream>
+
+struct C {
+ C(int& i) : ref(i) { }
+ int& ref;
+ bool operator<(const C& c) const { return ref < c.ref; }
+};
+
+int main()
+{
+ int i = 1;
+ C c(i);
+
+ std::deque<C> d;
+ d.push_back(c);
+ std::deque<C>::iterator diter = d.begin();
+// { dg-final { regexp-test diter {ref = @0x.*} } }
+
+ std::list<C> l;
+ l.push_back(c);
+ std::list<C>::iterator liter = l.begin();
+ // Need to ensure the list<C>::iterator::_Node typedef is in the debuginfo:
+ int tmp __attribute__((unused)) = (*liter).ref;
+// { dg-final { regexp-test liter {ref = @0x.*} } }
+
+ __gnu_cxx::slist<C> sl;
+ sl.push_front(c);
+ __gnu_cxx::slist<C>::iterator sliter = sl.begin();
+// { dg-final { regexp-test sliter {ref = @0x.*} } }
+
+ std::set<C> s;
+ s.insert(c);
+ std::set<C>::iterator siter = s.begin();
+// { dg-final { regexp-test siter {ref = @0x.*} } }
+
+ std::vector<C> v;
+ v.push_back(c);
+ std::vector<C>::iterator viter = v.begin();
+// { dg-final { regexp-test viter {ref = @0x.*} } }
+
+ std::cout << "\n";
+ return 0; // Mark SPOT
+}
+// { dg-final { gdb-test SPOT } }
More information about the Libstdc++
mailing list