diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/guile/scm-value.c | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 02229bc..3edc4fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-09-21 Simon Marchi <simon.marchi@ericsson.com> + + * guile/scm-value.c (gdbscm_value_address): Initialize address, + get rid of res_val. + 2017-09-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure.nat <i386sol2,i386>: Add fork-inferior.o to NATDEPFILES. diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c index 0dc6630..3732666 100644 --- a/gdb/guile/scm-value.c +++ b/gdb/guile/scm-value.c @@ -421,24 +421,19 @@ gdbscm_value_address (SCM self) if (SCM_UNBNDP (v_smob->address)) { - struct value *res_val = NULL; struct cleanup *cleanup = make_cleanup_value_free_to_mark (value_mark ()); - SCM address; + SCM address = SCM_BOOL_F; TRY { - res_val = value_addr (value); + address = vlscm_scm_from_value (value_addr (value)); } CATCH (except, RETURN_MASK_ALL) { - address = SCM_BOOL_F; } END_CATCH - if (res_val != NULL) - address = vlscm_scm_from_value (res_val); - do_cleanups (cleanup); if (gdbscm_is_exception (address)) |