diff mbox

frame.c: Fix the check for FID_STACK_INVALID in frame_id_eq().

Message ID 20141130154110.GE4882@adacore.com
State New
Headers show

Commit Message

Joel Brobecker Nov. 30, 2014, 3:41 p.m. UTC
On Tue, Nov 25, 2014 at 04:34:48PM -0300, Martin Galvan wrote:
> I noticed in frame_id_eq() we were checking for the "l" frame_id being invalid twice instead of checking both "l" and "r", so I corrected it.
> 
> gdb/ChangeLog:
> 
> 2014-11-25  Martin Galvan  <martin.galvan@tallertechnologies.com>
> 
>     * frame.c (frame_id_eq): Fix the check for FID_STACK_INVALID.

Thank you for the patch. It does indeed look pretty obvious.

You're patch did not apply for some reason, but since it was so
simple, I just redid it, bearing in mind Sergio's comments.
I then re-ran the testsuite on x86_64-linux to make sure it doesn't
cause any regression.

Attached is what I ended pushing (as both obvious and under 'tiny
patch' rule, meaning that you don't need a copyright assignment
for this change). If you are interested in contributing more patches
to GDB, you'll need a copyright assignement in place with the FSF.
Let us know and we will get you started; the process can be somewhat
lengthy.
diff mbox

Patch

From 0bba2ddfa79b718e4bab94f2827165bd5b55c92c Mon Sep 17 00:00:00 2001
From: Martin Galvan <martin.galvan@tallertechnologies.com>
Date: Sun, 30 Nov 2014 19:34:15 +0400
Subject: [PATCH] frame.c: Fix the check for FID_STACK_INVALID in frame_id_eq()

I noticed in frame_id_eq() we were checking for the "l" frame_id being
invalid twice instead of checking both "l" and "r", so this patch
corrects it.

gdb/ChangeLog:

	* frame.c (frame_id_eq): Fix the check for FID_STACK_INVALID.
---
 gdb/ChangeLog | 5 +++++
 gdb/frame.c   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4112438..f706f29 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@ 
+2014-11-30  Martin Galvan  <martin.galvan@tallertechnologies.com>  (tiny patch, obvious)
+
+	Pushed by Joel Brobecker  <brobecker@adacore.com>.
+	* frame.c (frame_id_eq): Fix the check for FID_STACK_INVALID.
+
 2014-11-29  Siva Chandra Reddy  <sivachandra@google.com>
 
 	* eval.c (evaluate_subexp): Check that the thread stack	temporaries
diff --git a/gdb/frame.c b/gdb/frame.c
index 0663af9..75ad341 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -614,7 +614,7 @@  frame_id_eq (struct frame_id l, struct frame_id r)
        outer_frame_id.  */
     eq = 1;
   else if (l.stack_status == FID_STACK_INVALID
-	   || l.stack_status == FID_STACK_INVALID)
+	   || r.stack_status == FID_STACK_INVALID)
     /* Like a NaN, if either ID is invalid, the result is false.
        Note that a frame ID is invalid iff it is the null frame ID.  */
     eq = 0;
-- 
1.9.1