From patchwork Mon Oct 10 13:01:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guinevere Larsen X-Patchwork-Id: 58591 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD34D38582BB for ; Mon, 10 Oct 2022 13:02:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD34D38582BB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665406954; bh=qdAwWgE70JXOoZEUv8TZltgU2/OzrsbtKM9jEZ99OyQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=QyutgqZ4ALAB7PygNMMqH0vFxRdPe0ewzL3lZU5JL5nekvMWnlUA7rWhMpdqh7A79 umr0fBxzRddG7OEeBAz4J1oOo8tQOA9G38JdUuYktpeEsWJ+wEy2jhLAVFhe9gLDVu xA2ZlctkGSlC6ofNxw/D+y1Xm984va3gMaf16qWc= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id E47C33858284 for ; Mon, 10 Oct 2022 13:02:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E47C33858284 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-ZTZezdK5NCqAvG94CxZc0A-1; Mon, 10 Oct 2022 09:02:08 -0400 X-MC-Unique: ZTZezdK5NCqAvG94CxZc0A-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 35B03101A52A for ; Mon, 10 Oct 2022 13:02:08 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.39.194.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F10949BB62; Mon, 10 Oct 2022 13:02:07 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH] Fix build breakage from recent patches Date: Mon, 10 Oct 2022 15:01:52 +0200 Message-Id: <20221010130152.2337922-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-17.2 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Bruno Larsen via Gdb-patches From: Guinevere Larsen Reply-To: Bruno Larsen Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" The recent patches related to making introduced buld failures when trying to build GDB with guile support. This posed a non-trivial problem to fix since guile handles exceptions using longjmp, so we couldn't just blindly throw frame_info_ptr everywhere. The fix makes minimal use of the smart pointer wrapper only using it in function calls or in scopes where no longjmp exceptions can be thrown. --- gdb/guile/scm-frame.c | 48 +++++++++++++++++++++++------------------- gdb/guile/scm-symbol.c | 4 ++-- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c index 159603b8008..51e2ecd9808 100644 --- a/gdb/guile/scm-frame.c +++ b/gdb/guile/scm-frame.c @@ -134,7 +134,7 @@ frscm_eq_frame_smob (const void *ap, const void *bp) const frame_smob *a = (const frame_smob *) ap; const frame_smob *b = (const frame_smob *) bp; - return (frame_id_eq (a->frame_id, b->frame_id) + return (a->frame_id == b->frame_id && a->inferior == b->inferior && a->inferior != NULL); } @@ -232,7 +232,7 @@ gdbscm_frame_p (SCM scm) Returns a object if there is an error. */ static SCM -frscm_scm_from_frame (struct frame_info *frame, struct inferior *inferior) +frscm_scm_from_frame (frame_info_ptr frame, struct inferior *inferior) { frame_smob *f_smob, f_smob_for_lookup; SCM f_scm; @@ -294,7 +294,11 @@ static SCM frscm_scm_from_frame_unsafe (struct frame_info *frame, struct inferior *inferior) { - SCM f_scm = frscm_scm_from_frame (frame, inferior); + SCM f_scm; + { + frame_info_ptr smart_frame(frame); + f_scm = frscm_scm_from_frame (smart_frame, inferior); + } if (gdbscm_is_exception (f_scm)) gdbscm_throw (f_scm); @@ -362,16 +366,15 @@ frscm_get_frame_smob_arg_unsafe (SCM self, int arg_pos, const char *func_name) struct frame_info * frscm_frame_smob_to_frame (frame_smob *f_smob) { - struct frame_info *frame; + frame_info_ptr frame = frame_find_by_id (f_smob->frame_id); - frame = frame_find_by_id (f_smob->frame_id); if (frame == NULL) return NULL; if (f_smob->frame_id_is_next) frame = get_prev_frame (frame); - return frame; + return frame.get (); } @@ -423,7 +426,7 @@ gdbscm_frame_name (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - name = find_frame_funname (frame, &lang, NULL); + name = find_frame_funname (frame_info_ptr (frame), &lang, NULL); } catch (const gdb_exception &except) { @@ -462,7 +465,7 @@ gdbscm_frame_type (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - type = get_frame_type (frame); + type = get_frame_type (frame_info_ptr (frame)); } catch (const gdb_exception &except) { @@ -539,7 +542,7 @@ gdbscm_frame_unwind_stop_reason (SCM self) _("")); } - stop_reason = get_frame_unwind_stop_reason (frame); + stop_reason = get_frame_unwind_stop_reason (frame_info_ptr (frame)); return scm_from_int (stop_reason); } @@ -561,7 +564,7 @@ gdbscm_frame_pc (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - pc = get_frame_pc (frame); + pc = get_frame_pc (frame_info_ptr (frame)); } catch (const gdb_exception &except) { @@ -595,7 +598,7 @@ gdbscm_frame_block (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - block = get_frame_block (frame, NULL); + block = get_frame_block (frame_info_ptr (frame), NULL); } catch (const gdb_exception &except) { @@ -647,7 +650,7 @@ gdbscm_frame_function (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - sym = find_pc_function (get_frame_address_in_block (frame)); + sym = find_pc_function (get_frame_address_in_block (frame_info_ptr (frame))); } catch (const gdb_exception &except) { @@ -685,7 +688,7 @@ gdbscm_frame_older (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - prev = get_prev_frame (frame); + prev = get_prev_frame (frame_info_ptr (frame)).get (); } catch (const gdb_exception &except) { @@ -723,7 +726,7 @@ gdbscm_frame_newer (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - next = get_next_frame (frame); + next = get_next_frame (frame_info_ptr (frame)).get (); } catch (const gdb_exception &except) { @@ -760,7 +763,7 @@ gdbscm_frame_sal (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - sal = find_frame_sal (frame); + sal = find_frame_sal (frame_info_ptr (frame)); } catch (const gdb_exception &except) { @@ -801,11 +804,12 @@ gdbscm_frame_read_register (SCM self, SCM register_scm) frame = frscm_frame_smob_to_frame (f_smob); if (frame) { - regnum = user_reg_map_name_to_regnum (get_frame_arch (frame), + frame_info_ptr p_frame (frame); + regnum = user_reg_map_name_to_regnum (get_frame_arch (p_frame), register_str, strlen (register_str)); if (regnum >= 0) - value = value_of_register (regnum, frame); + value = value_of_register (regnum, p_frame); } } catch (const gdb_exception &ex) @@ -905,7 +909,7 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest) struct block_symbol lookup_sym; if (block == NULL) - block = get_frame_block (frame, NULL); + block = get_frame_block (frame_info_ptr (frame), NULL); lookup_sym = lookup_symbol (var_name.get (), block, VAR_DOMAIN, NULL); var = lookup_sym.symbol; @@ -932,7 +936,7 @@ gdbscm_frame_read_var (SCM self, SCM symbol_scm, SCM rest) try { - value = read_var_value (var, block, frame); + value = read_var_value (var, block, frame_info_ptr (frame)); } catch (const gdb_exception &except) { @@ -959,7 +963,7 @@ gdbscm_frame_select (SCM self) { frame = frscm_frame_smob_to_frame (f_smob); if (frame != NULL) - select_frame (frame); + select_frame (frame_info_ptr (frame)); } catch (const gdb_exception &except) { @@ -987,7 +991,7 @@ gdbscm_newest_frame (void) gdbscm_gdb_exception exc {}; try { - frame = get_current_frame (); + frame = get_current_frame ().get (); } catch (const gdb_exception &except) { @@ -1009,7 +1013,7 @@ gdbscm_selected_frame (void) gdbscm_gdb_exception exc {}; try { - frame = get_selected_frame (_("No frame is currently selected")); + frame = get_selected_frame (_("No frame is currently selected")).get (); } catch (const gdb_exception &except) { diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c index 4344a633334..5f1d03419d3 100644 --- a/gdb/guile/scm-symbol.c +++ b/gdb/guile/scm-symbol.c @@ -551,7 +551,7 @@ gdbscm_symbol_value (SCM self, SCM rest) was found, so we have no block to pass to read_var_value. This will yield an incorrect value when symbol is not local to FRAME_INFO (this can happen with nested functions). */ - value = read_var_value (symbol, NULL, frame_info); + value = read_var_value (symbol, NULL, frame_info_ptr (frame_info)); } catch (const gdb_exception &except) { @@ -598,11 +598,11 @@ gdbscm_lookup_symbol (SCM name_scm, SCM rest) } else { - struct frame_info *selected_frame; gdbscm_gdb_exception exc {}; try { + frame_info_ptr selected_frame; selected_frame = get_selected_frame (_("no frame selected")); block = get_frame_block (selected_frame, NULL); }