From: Phil Muldoon Date: Tue, 20 Aug 2013 19:20:42 +0000 (+0000) Subject: re PR libstdc++/53477 (pretty printer fails with: Python Exception list index out of range) 2013-08-20 Phil Muldoon PR libstdc++/53477 http://sourceware.org/bugzilla/show_bug.cgi?id=15195 * python/libstdcxx/v6/printers.py (Printer.__call__): If a value is a reference, fetch referenced value. (RxPrinter.invoke): Ditto. * testsuite/libstdc++-prettyprinters/cxx11.cc (main): Add -O0 flag. Add referenced value tests. From-SVN: r201888 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 737f89cc8e8d..689dc99fe17f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,14 @@ +2013-08-20 Phil Muldoon + + PR libstdc++/53477 + http://sourceware.org/bugzilla/show_bug.cgi?id=15195 + + * python/libstdcxx/v6/printers.py (Printer.__call__): If a value + is a reference, fetch referenced value. + (RxPrinter.invoke): Ditto. + * testsuite/libstdc++-prettyprinters/cxx11.cc (main): Add -O0 + flag. Add referenced value tests. + 2013-08-20 Tim Shen * include/bits/regex_constants.h: Add underlying `unsigned int` for diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index de50d1e05ece..3465348fbe20 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -786,6 +786,11 @@ class RxPrinter(object): def invoke(self, value): if not self.enabled: return None + + if value.type.code == gdb.TYPE_CODE_REF: + if hasattr(gdb.Value,"referenced_value"): + value = value.referenced_value() + return self.function(self.name, value) # A pretty-printer that conforms to the "PrettyPrinter" protocol from @@ -841,6 +846,11 @@ class Printer(object): return None basename = match.group(1) + + if val.type.code == gdb.TYPE_CODE_REF: + if hasattr(gdb.Value,"referenced_value"): + val = val.referenced_value() + if basename in self.lookup: return self.lookup[basename].invoke(val) diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc index 29e8ceafb051..6ca02aa4e1f5 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc @@ -1,5 +1,5 @@ // { dg-do run } -// { dg-options "-std=gnu++11 -g" } +// { dg-options "-std=gnu++11 -g -O0" } // Copyright (C) 2011-2013 Free Software Foundation, Inc. // @@ -25,6 +25,8 @@ #include #include +typedef std::tuple ExTuple; + template void placeholder(const T &s) @@ -63,43 +65,75 @@ main() std::forward_list efl; // { dg-final { note-test efl "empty std::forward_list" } } + std::forward_list &refl = efl; +// { dg-final { note-test refl "empty std::forward_list" } } + std::forward_list fl; fl.push_front(2); fl.push_front(1); // { dg-final { note-test fl {std::forward_list = {[0] = 1, [1] = 2}} } } + std::forward_list &rfl = fl; +// { dg-final { note-test rfl {std::forward_list = {[0] = 1, [1] = 2}} } } + std::unordered_map eum; // { dg-final { note-test eum "std::unordered_map with 0 elements" } } + std::unordered_map &reum = eum; +// { dg-final { note-test reum "std::unordered_map with 0 elements" } } + std::unordered_multimap eumm; // { dg-final { note-test eumm "std::unordered_multimap with 0 elements" } } + std::unordered_multimap &reumm = eumm; +// { dg-final { note-test reumm "std::unordered_multimap with 0 elements" } } + std::unordered_set eus; // { dg-final { note-test eus "std::unordered_set with 0 elements" } } + std::unordered_set &reus = eus; +// { dg-final { note-test reus "std::unordered_set with 0 elements" } } + std::unordered_multiset eums; // { dg-final { note-test eums "std::unordered_multiset with 0 elements" } } + std::unordered_multiset &reums = eums; +// { dg-final { note-test reums "std::unordered_multiset with 0 elements" } } std::unordered_map uom; uom[5] = "three"; uom[3] = "seven"; // { dg-final { note-test uom {std::unordered_map with 2 elements = {[3] = "seven", [5] = "three"}} } } + std::unordered_map &ruom = uom; +// { dg-final { note-test ruom {std::unordered_map with 2 elements = {[3] = "seven", [5] = "three"}} } } + std::unordered_multimap uomm; uomm.insert(std::pair (5, "three")); uomm.insert(std::pair (5, "seven")); // { dg-final { note-test uomm {std::unordered_multimap with 2 elements = {[5] = "seven", [5] = "three"}} } } + std::unordered_multimap &ruomm = uomm; +// { dg-final { note-test ruomm {std::unordered_multimap with 2 elements = {[5] = "seven", [5] = "three"}} } } std::unordered_set uos; uos.insert(5); // { dg-final { note-test uos {std::unordered_set with 1 elements = {[0] = 5}} } } + std::unordered_set &ruos = uos; +// { dg-final { note-test ruos {std::unordered_set with 1 elements = {[0] = 5}} } } std::unordered_multiset uoms; uoms.insert(5); // { dg-final { note-test uoms {std::unordered_multiset with 1 elements = {[0] = 5}} } } + std::unordered_multiset &ruoms = uoms; +// { dg-final { note-test ruoms {std::unordered_multiset with 1 elements = {[0] = 5}} } } std::unique_ptr uptr (new datum); uptr->s = "hi bob"; uptr->i = 23; // { dg-final { regexp-test uptr {std::unique_ptr.datum. containing 0x.*} } } + std::unique_ptr &ruptr = uptr; +// { dg-final { regexp-test ruptr {std::unique_ptr.datum. containing 0x.*} } } + ExTuple tpl(6,7); +// { dg-final { note-test tpl {std::tuple containing = {[1] = 6, [2] = 7}} } } + ExTuple &rtpl = tpl; +// { dg-final { note-test rtpl {std::tuple containing = {[1] = 6, [2] = 7}} } } placeholder(""); // Mark SPOT use(efl); use(fl);