This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] [Guile] Fix value-dynamic-type for reference values
- From: Doug Evans <xdje42 at gmail dot com>
- To: Siva Chandra <sivachandra at google dot com>, gdb-patches <gdb-patches at sourceware dot org>
- Date: Sat, 12 Apr 2014 09:18:13 -0700
- Subject: [commit] [Guile] Fix value-dynamic-type for reference values
- Authentication-results: sourceware.org; auth=none
- References: <CAGyQ6gwhndLZEvGc_JgXGtDmYTs-T1P2rYFgc9ZJ1vK9-9NLvQ at mail dot gmail dot com> <CADPb22RfB3ikAGdkbr8WiwAUDp61tkPMWbAy6e-hv7=1LV8wEg at mail dot gmail dot com> <CAGyQ6gwyr=SnrYF6BEECi+CBY5MsLM1=izxNVrvG9vCpVimZqA at mail dot gmail dot com>
Siva Chandra <sivachandra@google.com> writes:
> On Fri, Apr 4, 2014 at 12:12 PM, Doug Evans <dje@google.com> wrote:
>>> ChangeLog:
>>> 2014-04-02 Siva Chandra Reddy <sivachandra@google.com>
>>>
>>> * 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.
>>
>> LGTM.
>
> Thank you. Pushed: 7af389b892404edc76e1a60c59b354b785378fa5
Thanks.
Copied to Guile side thusly.
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.
testsuite/
* gdb.guile/scm-value.c: Improve test case.
* gdb.guile/scm-value.exp: Add new test.
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/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"