public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
From: jkratoch@sourceware.org
To: archer-commits@sourceware.org
Subject: [SCM]  archer-jankratochvil-entryval: Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final-s390
Date: Mon, 05 Sep 2011 21:24:00 -0000	[thread overview]
Message-ID: <20110905212401.11528.qmail@sourceware.org> (raw)

The branch, archer-jankratochvil-entryval has been updated
       via  c8087d16f579f754a7f235854fa1fc7d3ef1c00f (commit)
       via  e12000060c2ed77e604da159516f2fac56dbcc8b (commit)
       via  51d4b8d99d118b87b01ef96af31dd78afb26f318 (commit)
       via  148fde3774eea0e1c77e67e46607e01e2f86740c (commit)
       via  b5d3b5f2b1bbae3a30a6311dfa059b7a7879beba (commit)
       via  8a5851ca0323381477075ec020d80b4a0f759681 (commit)
       via  091f6338a585f16d5688e2123b04af4050c869b7 (commit)
      from  3d7e1c408d0b21ab39015610263b12825d49f7df (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit c8087d16f579f754a7f235854fa1fc7d3ef1c00f
Merge: 3d7e1c4 e120000
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Sep 5 23:23:49 2011 +0200

    Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final-s390

commit e12000060c2ed77e604da159516f2fac56dbcc8b
Merge: ed9acb7 51d4b8d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Sep 5 23:23:48 2011 +0200

    Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final

commit 51d4b8d99d118b87b01ef96af31dd78afb26f318
Merge: b6e512f 148fde3
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Sep 5 23:23:44 2011 +0200

    Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref

commit 148fde3774eea0e1c77e67e46607e01e2f86740c
Merge: 1678ead b5d3b5f
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Sep 5 23:23:42 2011 +0200

    Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp

commit b5d3b5f2b1bbae3a30a6311dfa059b7a7879beba
Merge: 699662d 8a5851c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Sep 5 23:23:39 2011 +0200

    Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref

commit 8a5851ca0323381477075ec020d80b4a0f759681
Merge: 8c2ff7b 091f633
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Sep 5 23:23:37 2011 +0200

    Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull

commit 091f6338a585f16d5688e2123b04af4050c869b7
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Mon Sep 5 23:23:13 2011 +0200

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/stack.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

First 500 lines of diff:
diff --git a/gdb/stack.c b/gdb/stack.c
index 262e4ce..e01548d 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -299,11 +299,12 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame,
 	  entryval_error = NULL;
 	}
 
-      if (!ui_out_is_mi_like_p (current_uiout)
-	  && (print_entry_values == print_entry_values_compact
-	      || print_entry_values == print_entry_values_default))
+      if (print_entry_values == print_entry_values_compact
+	  || print_entry_values == print_entry_values_default)
 	{
-	  if (val && entryval)
+	  /* For MI do not try to use print_entry_values_compact for ARGP.  */
+
+	  if (val && entryval && !ui_out_is_mi_like_p (current_uiout))
 	    {
 	      unsigned len = TYPE_LENGTH (value_type (val));
 
@@ -360,11 +361,18 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame,
 		    entryval = NULL;
 		}
 	    }
+
+	  /* Try to remove possibly duplicate error message for ENTRYARGP even
+	     in MI mode.  */
+
 	  if (val_error && entryval_error
 	      && strcmp (val_error, entryval_error) == 0)
 	    {
 	      entryval_error = NULL;
-	      val_equal = 1;
+
+	      /* Do not se VAL_EQUAL as the same error message may be shown for
+		 the entry value even if no entry values are present in the
+		 inferior.  */
 	    }
 	}
     }


hooks/post-receive
--
Repository for Project Archer.


             reply	other threads:[~2011-09-05 21:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-05 21:24 jkratoch [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-09-05 21:00 jkratoch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110905212401.11528.qmail@sourceware.org \
    --to=jkratoch@sourceware.org \
    --cc=archer-commits@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).