From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30895 invoked by alias); 23 Feb 2012 08:38:04 -0000 Received: (qmail 30872 invoked by uid 22791); 23 Feb 2012 08:38:03 -0000 X-SWARE-Spam-Status: No, hits=-6.6 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 23 Feb 2012 08:37:48 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1N8bmbL015759 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 23 Feb 2012 03:37:48 -0500 Received: from host2.jankratochvil.net (ovpn-116-21.ams2.redhat.com [10.36.116.21]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q1N8biNn006255 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Thu, 23 Feb 2012 03:37:47 -0500 Date: Thu, 23 Feb 2012 08:38:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch] Fix another stale frame_info * Message-ID: <20120223083743.GA5696@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-02/txt/msg00502.txt.bz2 Hi, ISTM one cannot safely initialize FRAME_CALLER_PC unconditionally. No regressions on {x86_64,x86_64-m32,i686}-fedora17-linux-gnu. I will check it in. Thanks, Jan gdb/ 2012-02-23 Jan Kratochvil * breakpoint.c (until_break_command): New variables frame_caller_id, frame_caller_pc and frame_caller_arch. Use them after set_momentary_breakpoint. --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9853,12 +9853,19 @@ until_break_command (char *arg, int from_tty, int anywhere) struct symtabs_and_lines sals; struct symtab_and_line sal; struct frame_info *frame = get_selected_frame (NULL); + struct frame_id frame_caller_id = frame_unwind_caller_id (frame); + /* Initialize it just to avoid a GCC false warning. */ + CORE_ADDR frame_caller_pc = 0; + struct gdbarch *frame_caller_arch = frame_unwind_caller_arch (frame); struct breakpoint *breakpoint; struct breakpoint *breakpoint2 = NULL; struct cleanup *old_chain; int thread; struct thread_info *tp; + if (frame_id_p (frame_caller_id)) + frame_caller_pc = frame_unwind_caller_pc (frame); + clear_proceed_status (); /* Set a breakpoint where the user wants it and at return from @@ -9903,17 +9912,15 @@ until_break_command (char *arg, int from_tty, int anywhere) /* Keep within the current frame, or in frames called by the current one. */ - if (frame_id_p (frame_unwind_caller_id (frame))) + if (frame_id_p (frame_caller_id)) { - sal = find_pc_line (frame_unwind_caller_pc (frame), 0); - sal.pc = frame_unwind_caller_pc (frame); - breakpoint2 = set_momentary_breakpoint (frame_unwind_caller_arch (frame), - sal, - frame_unwind_caller_id (frame), - bp_until); + sal = find_pc_line (frame_caller_pc, 0); + sal.pc = frame_caller_pc; + breakpoint2 = set_momentary_breakpoint (frame_caller_arch, sal, + frame_caller_id, bp_until); make_cleanup_delete_breakpoint (breakpoint2); - set_longjmp_breakpoint (tp, frame_unwind_caller_id (frame)); + set_longjmp_breakpoint (tp, frame_caller_id); make_cleanup (delete_longjmp_breakpoint_cleanup, &thread); }