diff options
| author | Siva Chandra <sivachandra@chromium.org> | 2014-03-21 06:42:50 -0700 |
|---|---|---|
| committer | Siva Chandra <sivachandra@chromium.org> | 2014-04-07 14:18:44 -0700 |
| commit | 7af389b892404edc76e1a60c59b354b785378fa5 (patch) | |
| tree | d54320b4ecb69f5570d4887f3cc3277c6f7ad6c3 | |
| parent | 5e703181143d5eb3724115e5cbb59a6b294e6222 (diff) | |
| download | gdb-7af389b892404edc76e1a60c59b354b785378fa5.zip gdb-7af389b892404edc76e1a60c59b354b785378fa5.tar.gz gdb-7af389b892404edc76e1a60c59b354b785378fa5.tar.bz2 | |
[python] Fix gdb.Value.dynamic_type for reference values.
gdb.Value.dynamic_type is supposed to work for reference and pointer
values. However, the value object in the function 'valpy_get_dynamic_type'
was being dereferenced using 'value_ind' irrespective of the value type
being TYPE_CODE_PTR or TYPE_CODE_REF. This patch fixes that to use
'coerce_ref' for TYPE_CODE_REF values.
ChangeLog:
* python/py-value.c (valpy_get_dynamic_type): Use coerce_ref to
dereference TYPE_CODE_REF values.
testsuite/
* gdb.python/py-value.c: Improve test case.
* gdb.python/py-value.exp: Add new test.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/python/py-value.c | 5 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-value.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.python/py-value.exp | 2 |
5 files changed, 18 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e975593..e2962c9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2014-04-07 Siva Chandra Reddy <sivachandra@google.com> + + * python/py-value.c (valpy_get_dynamic_type): Use coerce_ref to + dereference TYPE_CODE_REF values. + 2014-04-07 Joel Brobecker <brobecker@adacore.com> * darwin-nat.c (darwin_decode_message): Remove trailing '\n' at diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index a118f6c..54da67a 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -309,7 +309,10 @@ valpy_get_dynamic_type (PyObject *self, void *closure) struct value *target; int was_pointer = TYPE_CODE (type) == TYPE_CODE_PTR; - target = value_ind (val); + if (was_pointer) + target = value_ind (val); + else + target = coerce_ref (val); type = value_rtti_type (target, NULL, NULL, NULL); if (type) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 991c4e8..6826ec4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-04-07 Siva Chandra Reddy <sivachandra@google.com> + + * gdb.python/py-value.c: Improve test case. + * gdb.python/py-value.exp: Add new test. + 2014-04-07 David Blaikie <dblaikie@gmail.com> * lib/compiler.c: Identify the clang compiler. diff --git a/gdb/testsuite/gdb.python/py-value.c b/gdb/testsuite/gdb.python/py-value.c index 90dc055..4d1c9c6 100644 --- a/gdb/testsuite/gdb.python/py-value.c +++ b/gdb/testsuite/gdb.python/py-value.c @@ -58,6 +58,8 @@ struct Derived : public Base { }; Base *base = new Derived (); +Derived derived; +Base &base_ref = derived; void ptr_ref(int*& rptr_int) { diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp index ed332db..13433fd 100644 --- a/gdb/testsuite/gdb.python/py-value.exp +++ b/gdb/testsuite/gdb.python/py-value.exp @@ -416,6 +416,8 @@ proc test_subscript_regression {exefile lang} { # Likewise. gdb_test "python print (gdb.parse_and_eval('base').dynamic_type)" \ "Derived \[*\]" + gdb_test "python print (gdb.parse_and_eval('base_ref').dynamic_type)" \ + "Derived \[&\]" # A static type case. gdb_test "python print (gdb.parse_and_eval('5').dynamic_type)" \ "int" |