You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
131 lines
5.0 KiB
131 lines
5.0 KiB
2013-08-20 Phil Muldoon <pmuldoon@redhat.com> |
|
|
|
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. |
|
|
|
--- libstdc++-v3/python/libstdcxx/v6/printers.py (revision 201887) |
|
+++ libstdc++-v3/python/libstdcxx/v6/printers.py (revision 201888) |
|
@@ -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) |
|
|
|
--- libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc (revision 201887) |
|
+++ libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc (revision 201888) |
|
@@ -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. |
|
// |
|
@@ -24,6 +24,8 @@ |
|
#include <string> |
|
#include <iostream> |
|
|
|
+typedef std::tuple<int, int> ExTuple; |
|
+ |
|
template<class T> |
|
void |
|
placeholder(const T &s) |
|
@@ -62,43 +64,75 @@ main() |
|
std::forward_list<int> efl; |
|
// { dg-final { note-test efl "empty std::forward_list" } } |
|
|
|
+ std::forward_list<int> &refl = efl; |
|
+// { dg-final { note-test refl "empty std::forward_list" } } |
|
+ |
|
std::forward_list<int> fl; |
|
fl.push_front(2); |
|
fl.push_front(1); |
|
// { dg-final { note-test fl {std::forward_list = {[0] = 1, [1] = 2}} } } |
|
|
|
+ std::forward_list<int> &rfl = fl; |
|
+// { dg-final { note-test rfl {std::forward_list = {[0] = 1, [1] = 2}} } } |
|
+ |
|
std::unordered_map<int, std::string> eum; |
|
// { dg-final { note-test eum "std::unordered_map with 0 elements" } } |
|
+ std::unordered_map<int, std::string> &reum = eum; |
|
+// { dg-final { note-test reum "std::unordered_map with 0 elements" } } |
|
+ |
|
std::unordered_multimap<int, std::string> eumm; |
|
// { dg-final { note-test eumm "std::unordered_multimap with 0 elements" } } |
|
+ std::unordered_multimap<int, std::string> &reumm = eumm; |
|
+// { dg-final { note-test reumm "std::unordered_multimap with 0 elements" } } |
|
+ |
|
std::unordered_set<int> eus; |
|
// { dg-final { note-test eus "std::unordered_set with 0 elements" } } |
|
+ std::unordered_set<int> &reus = eus; |
|
+// { dg-final { note-test reus "std::unordered_set with 0 elements" } } |
|
+ |
|
std::unordered_multiset<int> eums; |
|
// { dg-final { note-test eums "std::unordered_multiset with 0 elements" } } |
|
+ std::unordered_multiset<int> &reums = eums; |
|
+// { dg-final { note-test reums "std::unordered_multiset with 0 elements" } } |
|
|
|
std::unordered_map<int, std::string> 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<int, std::string> &ruom = uom; |
|
+// { dg-final { note-test ruom {std::unordered_map with 2 elements = {[3] = "seven", [5] = "three"}} } } |
|
+ |
|
std::unordered_multimap<int, std::string> uomm; |
|
uomm.insert(std::pair<int, std::string> (5, "three")); |
|
uomm.insert(std::pair<int, std::string> (5, "seven")); |
|
// { dg-final { note-test uomm {std::unordered_multimap with 2 elements = {[5] = "seven", [5] = "three"}} } } |
|
+ std::unordered_multimap<int, std::string> &ruomm = uomm; |
|
+// { dg-final { note-test ruomm {std::unordered_multimap with 2 elements = {[5] = "seven", [5] = "three"}} } } |
|
|
|
std::unordered_set<int> uos; |
|
uos.insert(5); |
|
// { dg-final { note-test uos {std::unordered_set with 1 elements = {[0] = 5}} } } |
|
+ std::unordered_set<int> &ruos = uos; |
|
+// { dg-final { note-test ruos {std::unordered_set with 1 elements = {[0] = 5}} } } |
|
|
|
std::unordered_multiset<int> uoms; |
|
uoms.insert(5); |
|
// { dg-final { note-test uoms {std::unordered_multiset with 1 elements = {[0] = 5}} } } |
|
+ std::unordered_multiset<int> &ruoms = uoms; |
|
+// { dg-final { note-test ruoms {std::unordered_multiset with 1 elements = {[0] = 5}} } } |
|
|
|
std::unique_ptr<datum> uptr (new datum); |
|
uptr->s = "hi bob"; |
|
uptr->i = 23; |
|
// { dg-final { regexp-test uptr {std::unique_ptr.datum. containing 0x.*} } } |
|
+ std::unique_ptr<datum> &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);
|
|
|