diff options
| author | Doug Evans <xdje42@gmail.com> | 2014-04-12 09:09:41 -0700 |
|---|---|---|
| committer | Doug Evans <xdje42@gmail.com> | 2014-04-12 09:09:41 -0700 |
| commit | 0be03e84176ab0077462b84ef236c56a7a0376fd (patch) | |
| tree | 23beb33097129d8c9ff8798ba111f9150c273bed | |
| parent | f180a1fb463a6a9ab4a883374120d16770486914 (diff) | |
| download | gdb-0be03e84176ab0077462b84ef236c56a7a0376fd.zip gdb-0be03e84176ab0077462b84ef236c56a7a0376fd.tar.gz gdb-0be03e84176ab0077462b84ef236c56a7a0376fd.tar.bz2 | |
Copy over fix for fetching dynamic type of a reference from python side.
* guile/scm-value.c (gdbscm_value_dynamic_type): Use coerce_ref to
dereference TYPE_CODE_REF values.
testsuite/
* gdb.guile/scm-value.c: Improve test case.
* gdb.guile/scm-value.exp: Add new test.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/guile/scm-value.c | 5 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.guile/scm-value.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.guile/scm-value.exp | 2 |
5 files changed, 20 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2184479..83d75ac 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2014-04-12 Siva Chandra Reddy <sivachandra@google.com> + Doug Evans <xdje42@gmail.com> + + * guile/scm-value.c (gdbscm_value_dynamic_type): Use coerce_ref to + dereference TYPE_CODE_REF values. + 2014-04-11 Joel Brobecker <brobecker@adacore.com> Revert the following changes due to regressions: diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c index 8ca0762..2160a1e 100644 --- a/gdb/guile/scm-value.c +++ b/gdb/guile/scm-value.c @@ -585,7 +585,10 @@ gdbscm_value_dynamic_type (SCM self) struct value *target; int was_pointer = TYPE_CODE (type) == TYPE_CODE_PTR; - target = value_ind (value); + if (was_pointer) + target = value_ind (value); + else + target = coerce_ref (value); type = value_rtti_type (target, NULL, NULL, NULL); if (type) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f7a4b8e..730c116 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-04-12 Siva Chandra Reddy <sivachandra@google.com> + Doug Evans <xdje42@gmail.com> + + * gdb.guile/scm-value.c: Improve test case. + * gdb.guile/scm-value.exp: Add new test. + 2014-04-11 David Blaikie <dblaikie@gmail.com> * gdb.opt/inline-break.exp: Explicitly specify -std=gnu89 to diff --git a/gdb/testsuite/gdb.guile/scm-value.c b/gdb/testsuite/gdb.guile/scm-value.c index 3c61911..e4f7530 100644 --- a/gdb/testsuite/gdb.guile/scm-value.c +++ b/gdb/testsuite/gdb.guile/scm-value.c @@ -49,6 +49,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.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp index 0bcd381..2784da2 100644 --- a/gdb/testsuite/gdb.guile/scm-value.exp +++ b/gdb/testsuite/gdb.guile/scm-value.exp @@ -335,6 +335,8 @@ proc test_subscript_regression {exefile lang} { # Likewise. gdb_test "gu (print (value-dynamic-type (parse-and-eval \"base\")))" \ "= Derived \[*\]" + gdb_test "gu (print (value-dynamic-type (parse-and-eval \"base_ref\")))" \ + "= Derived \[&\]" # A static type case. gdb_test "gu (print (value-dynamic-type (parse-and-eval \"5\")))" \ "= int" |