diff options
| author | Pedro Alves <palves@redhat.com> | 2015-03-07 14:50:05 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-03-07 15:19:57 +0000 |
| commit | 6c63c96a22d216fb5d51c5d93646066d29e08ea1 (patch) | |
| tree | 310e31afd2f492535ae37445861bc007473180dd /gdb/guile/scm-frame.c | |
| parent | 492d29ea1c9a8b2c7d5193908119a4e27c045687 (diff) | |
| download | gdb-6c63c96a22d216fb5d51c5d93646066d29e08ea1.zip gdb-6c63c96a22d216fb5d51c5d93646066d29e08ea1.tar.gz gdb-6c63c96a22d216fb5d51c5d93646066d29e08ea1.tar.bz2 | |
more making TRY/CATCH callers look more like real C++ try/catch blocks
All these were caught by actually making TRY/CATCH use try/catch
behind the scenes, which then resulted in the build failing (on x86_64
Fedora 20) because there was code between the try and catch blocks.
gdb/ChangeLog:
2015-03-07 Pedro Alves <palves@redhat.com>
* breakpoint.c (save_breakpoints): Adjust to avoid code between
TRY and CATCH.
* gdbtypes.c (safe_parse_type): Remove empty line.
(types_deeply_equal):
* guile/scm-frame.c (gdbscm_frame_name):
* linux-thread-db.c (find_new_threads_once):
* python/py-breakpoint.c (bppy_get_commands):
* record-btrace.c (record_btrace_insert_breakpoint)
(record_btrace_remove_breakpoint, record_btrace_start_replaying)
(record_btrace_start_replaying): Adjust to avoid code between TRY
and CATCH.
Diffstat (limited to 'gdb/guile/scm-frame.c')
| -rw-r--r-- | gdb/guile/scm-frame.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index 6189802..ea51d1b 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -426,7 +426,6 @@ gdbscm_frame_name (SCM self) enum language lang = language_minimal; struct frame_info *frame = NULL; SCM result; - struct gdb_exception except = exception_none; f_smob = frscm_get_frame_smob_arg_unsafe (self, SCM_ARG1, FUNC_NAME); @@ -436,15 +435,13 @@ gdbscm_frame_name (SCM self) if (frame != NULL) find_frame_funname (frame, &name, &lang, NULL); } - CATCH (ex, RETURN_MASK_ALL) + CATCH (except, RETURN_MASK_ALL) { - except = ex; + xfree (name); + GDBSCM_HANDLE_GDB_EXCEPTION (except); } END_CATCH - xfree (name); - GDBSCM_HANDLE_GDB_EXCEPTION (except); - if (frame == NULL) { gdbscm_invalid_object_error (FUNC_NAME, SCM_ARG1, self, |