aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/frame.c2
2 files changed, 6 insertions, 1 deletions
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;