diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/bfd/version.h ./bfd/version.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/bfd/version.h	2019-04-16 02:03:54.000000000 +0000
+++ ./bfd/version.h	2019-04-23 02:03:39.000000000 +0000
@@ -16,7 +16,7 @@
 
    In releases, the date is not included in either version strings or
    sonames.  */
-#define BFD_VERSION_DATE 20190416
+#define BFD_VERSION_DATE 20190423
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/djunpack.bat ./djunpack.bat
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/djunpack.bat	2019-04-16 02:07:36.000000000 +0000
+++ ./djunpack.bat	2019-04-23 02:07:24.000000000 +0000
@@ -17,8 +17,8 @@ Rem
 Rem The following 2 lines need to be changed with each new GDB release, to
 Rem be identical to the name of the top-level directory where the GDB
 Rem distribution unpacks itself.
-set GDBVER=$package-8.2.91.20190416
-if "%GDBVER%"=="$package-8.2.91.20190416" GoTo EnvOk
+set GDBVER=$package-8.2.91.20190423
+if "%GDBVER%"=="$package-8.2.91.20190423" GoTo EnvOk
 Rem If their environment space is too small, re-exec with a larger one
 command.com /e:4096 /c %0 %1
 GoTo End
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/ChangeLog ./gdb/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/ChangeLog	2019-04-16 02:03:56.000000000 +0000
+++ ./gdb/ChangeLog	2019-04-23 02:03:41.000000000 +0000
@@ -1,3 +1,21 @@
+2019-04-19  Sergei Trofimovich <siarheit@google.com>
+
+	* configure.ac: add --enable-source-highlight switch.
+	* configure: Regenerate.
+	* top.c (print_gdb_version): plumb --enable-source-highlight
+	status to "show configuration".
+
+2019-04-19  Ilya Yu. Malakhov  <malakhov@mcst.ru>
+
+	PR symtab/24423:
+	* source.c (print_source_lines_base): Advance "iter" when a
+	control character is seen.
+
+2019-04-19  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
+
+	* inferior.h (struct infcall_suspend_state_deleter):
+	Catch exception in destructor to avoid crash.
+
 2019-04-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* utils.c (prompt_for_continue): Don't restore the styling at the
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/configure ./gdb/configure
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/configure	2019-04-16 02:03:56.000000000 +0000
+++ ./gdb/configure	2019-04-23 02:03:41.000000000 +0000
@@ -879,6 +879,7 @@ with_mpfr
 with_libmpfr_prefix
 with_python
 with_guile
+enable_source_highlight
 enable_libmcheck
 with_intel_pt
 with_libipt_prefix
@@ -1554,6 +1555,8 @@ Optional Features:
   --enable-profiling      enable profiling of GDB
   --enable-codesign=CERT  sign gdb with 'codesign -s CERT'
   --disable-rpath         do not hardcode runtime library paths
+  --enable-source-highlight
+                          enable source-highlight for source listings
   --enable-libmcheck      Try linking with -lmcheck if available
   --enable-werror         treat compile warnings as errors
   --enable-build-warnings enable build-time compiler warnings if gcc is used
@@ -11477,13 +11480,30 @@ fi
 
 SRCHIGH_LIBS=
 SRCHIGH_CFLAGS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for source highlight" >&5
-$as_echo_n "checking for source highlight... " >&6; }
-if test "${pkg_config_prog_path}" = "missing"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - pkg-config not found" >&5
-$as_echo "no - pkg-config not found" >&6; }
+
+# Check whether --enable-source-highlight was given.
+if test "${enable_source_highlight+set}" = set; then :
+  enableval=$enable_source_highlight; case "${enableval}" in
+  yes)  enable_source_highlight=yes ;;
+  no)   enable_source_highlight=no  ;;
+  *)    as_fn_error $? "bad value ${enableval} for source-highlight option" "$LINENO" 5 ;;
+esac
 else
-   if ${pkg_config_prog_path} --exists source-highlight; then
+  enable_source_highlight=auto
+fi
+
+
+if test "${enable_source_highlight}" != "no"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the source-highlight library" >&5
+$as_echo_n "checking for the source-highlight library... " >&6; }
+  if test "${pkg_config_prog_path}" = "missing"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - pkg-config not found" >&5
+$as_echo "no - pkg-config not found" >&6; }
+    if test "${enable_source_highlight}" = "yes"; then
+      as_fn_error $? "pkg-config was not found in your system" "$LINENO" 5
+    fi
+  else
+    if ${pkg_config_prog_path} --exists source-highlight; then
       SRCHIGH_CFLAGS=`${pkg_config_prog_path} --cflags source-highlight`
       SRCHIGH_LIBS=`${pkg_config_prog_path} --libs source-highlight`
 
@@ -11491,10 +11511,14 @@ else
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-   else
+    else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-   fi
+      if test "${enable_source_highlight}" = "yes"; then
+        as_fn_error $? "source-highlight was not found in your system" "$LINENO" 5
+      fi
+    fi
+  fi
 fi
 
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/configure.ac ./gdb/configure.ac
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/configure.ac	2019-04-16 02:03:56.000000000 +0000
+++ ./gdb/configure.ac	2019-04-23 02:03:41.000000000 +0000
@@ -1232,19 +1232,38 @@ AM_CONDITIONAL(HAVE_GUILE, test "${have_
 
 SRCHIGH_LIBS=
 SRCHIGH_CFLAGS=
-AC_MSG_CHECKING([for the source-highlight library])
-if test "${pkg_config_prog_path}" = "missing"; then
-   AC_MSG_RESULT([no - pkg-config not found])
-else
-   if ${pkg_config_prog_path} --exists source-highlight; then
+
+AC_ARG_ENABLE(source-highlight,
+  AS_HELP_STRING([--enable-source-highlight],
+    [enable source-highlight for source listings]),
+  [case "${enableval}" in
+  yes)  enable_source_highlight=yes ;;
+  no)   enable_source_highlight=no  ;;
+  *)    AC_MSG_ERROR(bad value ${enableval} for source-highlight option) ;;
+esac],
+[enable_source_highlight=auto])
+
+if test "${enable_source_highlight}" != "no"; then
+  AC_MSG_CHECKING([for the source-highlight library])
+  if test "${pkg_config_prog_path}" = "missing"; then
+    AC_MSG_RESULT([no - pkg-config not found])
+    if test "${enable_source_highlight}" = "yes"; then
+      AC_MSG_ERROR([pkg-config was not found in your system])
+    fi
+  else
+    if ${pkg_config_prog_path} --exists source-highlight; then
       SRCHIGH_CFLAGS=`${pkg_config_prog_path} --cflags source-highlight`
       SRCHIGH_LIBS=`${pkg_config_prog_path} --libs source-highlight`
       AC_DEFINE([HAVE_SOURCE_HIGHLIGHT], 1,
                 [Define to 1 if the source-highlight library is available])
       AC_MSG_RESULT([yes])
-   else
+    else
       AC_MSG_RESULT([no])
-   fi
+      if test "${enable_source_highlight}" = "yes"; then
+        AC_MSG_ERROR([source-highlight was not found in your system])
+      fi
+    fi
+  fi
 fi
 AC_SUBST(SRCHIGH_LIBS)
 AC_SUBST(SRCHIGH_CFLAGS)
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gcore.1 ./gdb/doc/gcore.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gcore.1	2019-04-16 02:07:29.000000000 +0000
+++ ./gdb/doc/gcore.1	2019-04-23 02:07:15.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GCORE 1"
-.TH GCORE 1 "2019-04-16" "gdb-8.2.91.20190416-git" "GNU Development Tools"
+.TH GCORE 1 "2019-04-23" "gdb-8.2.91.20190423-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.1 ./gdb/doc/gdb.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.1	2019-04-16 02:07:29.000000000 +0000
+++ ./gdb/doc/gdb.1	2019-04-23 02:07:15.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDB 1"
-.TH GDB 1 "2019-04-16" "gdb-8.2.91.20190416-git" "GNU Development Tools"
+.TH GDB 1 "2019-04-23" "gdb-8.2.91.20190423-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb-add-index.1 ./gdb/doc/gdb-add-index.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb-add-index.1	2019-04-16 02:07:30.000000000 +0000
+++ ./gdb/doc/gdb-add-index.1	2019-04-23 02:07:15.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDB-ADD-INDEX 1"
-.TH GDB-ADD-INDEX 1 "2019-04-16" "gdb-8.2.91.20190416-git" "GNU Development Tools"
+.TH GDB-ADD-INDEX 1 "2019-04-23" "gdb-8.2.91.20190423-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info ./gdb/doc/gdb.info
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info	2019-04-16 02:07:26.000000000 +0000
+++ ./gdb/doc/gdb.info	2019-04-23 02:07:11.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-1 ./gdb/doc/gdb.info-1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-1	2019-04-16 02:07:14.000000000 +0000
+++ ./gdb/doc/gdb.info-1	2019-04-23 02:06:54.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
@@ -44,7 +44,7 @@ Debugging with GDB
 
 This file describes GDB, the GNU symbolic debugger.
 
-   This is the Tenth Edition, for GDB (GDB) Version 8.2.91.20190416-git.
+   This is the Tenth Edition, for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
@@ -507,7 +507,7 @@ Let us use GDB to try to see what is goi
      There is absolutely no warranty for GDB; type "show warranty"
       for details.
 
-     GDB 8.2.91.20190416-git, Copyright 1999 Free Software Foundation, Inc...
+     GDB 8.2.91.20190423-git, Copyright 1999 Free Software Foundation, Inc...
      (gdb)
 
 GDB reads only enough symbol data to know where to find the rest when
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-2 ./gdb/doc/gdb.info-2
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-2	2019-04-16 02:07:16.000000000 +0000
+++ ./gdb/doc/gdb.info-2	2019-04-23 02:06:57.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-3 ./gdb/doc/gdb.info-3
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-3	2019-04-16 02:07:18.000000000 +0000
+++ ./gdb/doc/gdb.info-3	2019-04-23 02:07:00.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-4 ./gdb/doc/gdb.info-4
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-4	2019-04-16 02:07:20.000000000 +0000
+++ ./gdb/doc/gdb.info-4	2019-04-23 02:07:02.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-5 ./gdb/doc/gdb.info-5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-5	2019-04-16 02:07:22.000000000 +0000
+++ ./gdb/doc/gdb.info-5	2019-04-23 02:07:05.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-6 ./gdb/doc/gdb.info-6
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-6	2019-04-16 02:07:24.000000000 +0000
+++ ./gdb/doc/gdb.info-6	2019-04-23 02:07:08.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
@@ -2495,7 +2495,7 @@ and TeX (or 'texi2roff') to typeset the 
 
    GDB includes an already formatted copy of the on-line Info version of
 this manual in the 'gdb' subdirectory.  The main Info file is
-'gdb-8.2.91.20190416-git/gdb/gdb.info', and it refers to subordinate
+'gdb-8.2.91.20190423-git/gdb/gdb.info', and it refers to subordinate
 files matching 'gdb.info*' in the same directory.  If necessary, you can
 print out these files, or read them with any editor; but they are easier
 to read using the 'info' subsystem in GNU Emacs or the standalone 'info'
@@ -2505,8 +2505,8 @@ program, available as part of the GNU Te
 Info formatting programs, such as 'texinfo-format-buffer' or 'makeinfo'.
 
    If you have 'makeinfo' installed, and are in the top level GDB source
-directory ('gdb-8.2.91.20190416-git', in the case of version
-8.2.91.20190416-git), you can make the Info file by typing:
+directory ('gdb-8.2.91.20190423-git', in the case of version
+8.2.91.20190423-git), you can make the Info file by typing:
 
      cd gdb
      make gdb.info
@@ -2531,7 +2531,7 @@ On its own, TeX cannot either read or ty
 
    If you have TeX and a DVI printer program installed, you can typeset
 and print this manual.  First switch to the 'gdb' subdirectory of the
-main source directory (for example, to 'gdb-8.2.91.20190416-git/gdb')
+main source directory (for example, to 'gdb-8.2.91.20190423-git/gdb')
 and type:
 
      make gdb.dvi
@@ -2540,8 +2540,8 @@ and type:
 
    ---------- Footnotes ----------
 
-   (1) In 'gdb-8.2.91.20190416-git/gdb/refcard.ps' of the version
-8.2.91.20190416-git release.
+   (1) In 'gdb-8.2.91.20190423-git/gdb/refcard.ps' of the version
+8.2.91.20190423-git release.
 
 
 File: gdb.info,  Node: Installing GDB,  Next: Maintenance Commands,  Prev: Formatting Documentation,  Up: Top
@@ -2692,35 +2692,35 @@ preparing GDB for installation; you can 
 a single directory, whose name is usually composed by appending the
 version number to 'gdb'.
 
-   For example, the GDB version 8.2.91.20190416-git distribution is in
-the 'gdb-8.2.91.20190416-git' directory.  That directory contains:
+   For example, the GDB version 8.2.91.20190423-git distribution is in
+the 'gdb-8.2.91.20190423-git' directory.  That directory contains:
 
-'gdb-8.2.91.20190416-git/configure (and supporting files)'
+'gdb-8.2.91.20190423-git/configure (and supporting files)'
      script for configuring GDB and all its supporting libraries
 
-'gdb-8.2.91.20190416-git/gdb'
+'gdb-8.2.91.20190423-git/gdb'
      the source specific to GDB itself
 
-'gdb-8.2.91.20190416-git/bfd'
+'gdb-8.2.91.20190423-git/bfd'
      source for the Binary File Descriptor library
 
-'gdb-8.2.91.20190416-git/include'
+'gdb-8.2.91.20190423-git/include'
      GNU include files
 
-'gdb-8.2.91.20190416-git/libiberty'
+'gdb-8.2.91.20190423-git/libiberty'
      source for the '-liberty' free software library
 
-'gdb-8.2.91.20190416-git/opcodes'
+'gdb-8.2.91.20190423-git/opcodes'
      source for the library of opcode tables and disassemblers
 
-'gdb-8.2.91.20190416-git/readline'
+'gdb-8.2.91.20190423-git/readline'
      source for the GNU command-line interface
 
    There may be other subdirectories as well.
 
    The simplest way to configure and build GDB is to run 'configure'
 from the 'gdb-VERSION-NUMBER' source directory, which in this example is
-the 'gdb-8.2.91.20190416-git' directory.
+the 'gdb-8.2.91.20190423-git' directory.
 
    First switch to the 'gdb-VERSION-NUMBER' source directory if you are
 not already in it; then run 'configure'.  Pass the identifier for the
@@ -2728,7 +2728,7 @@ platform on which GDB will run as an arg
 
    For example:
 
-     cd gdb-8.2.91.20190416-git
+     cd gdb-8.2.91.20190423-git
      ./configure
      make
 
@@ -2776,13 +2776,13 @@ to specify a path to find 'configure' it
 directory.  If the path to 'configure' would be the same as the argument
 to '--srcdir', you can leave out the '--srcdir' option; it is assumed.)
 
-   For example, with version 8.2.91.20190416-git, you can build GDB in a
+   For example, with version 8.2.91.20190423-git, you can build GDB in a
 separate directory for a Sun 4 like this:
 
-     cd gdb-8.2.91.20190416-git
+     cd gdb-8.2.91.20190423-git
      mkdir ../gdb-sun4
      cd ../gdb-sun4
-     ../gdb-8.2.91.20190416-git/configure
+     ../gdb-8.2.91.20190423-git/configure
      make
 
    When 'configure' builds a configuration using a remote source
@@ -2793,7 +2793,7 @@ the example, you'd find the Sun 4 librar
 
    Make sure that your path to the 'configure' script has just one
 instance of 'gdb' in it.  If your path to 'configure' looks like
-'../gdb-8.2.91.20190416-git/gdb/configure', you are configuring only one
+'../gdb-8.2.91.20190423-git/gdb/configure', you are configuring only one
 subdirectory of GDB, not the whole package.  This leads to build errors
 about missing include files such as 'bfd/bfd.h'.
 
@@ -2809,8 +2809,8 @@ a configured directory--whatever directo
 
    The 'Makefile' that 'configure' generates in each source directory
 also runs recursively.  If you type 'make' in a source directory such as
-'gdb-8.2.91.20190416-git' (or in a separate configured directory
-configured with '--srcdir=DIRNAME/gdb-8.2.91.20190416-git'), you will
+'gdb-8.2.91.20190423-git' (or in a separate configured directory
+configured with '--srcdir=DIRNAME/gdb-8.2.91.20190423-git'), you will
 build all the required libraries, and then build GDB.
 
    When you have multiple hosts or targets configured in separate
@@ -2855,7 +2855,7 @@ you can use it to test your guesses on a
      Invalid configuration `i986v': machine `i986v' not recognized
 
 'config.sub' is also distributed in the GDB source directory
-('gdb-8.2.91.20190416-git', for version 8.2.91.20190416-git).
+('gdb-8.2.91.20190423-git', for version 8.2.91.20190423-git).
 
 
 File: gdb.info,  Node: Configure Options,  Next: System-wide configuration,  Prev: Config Names,  Up: Installing GDB
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-7 ./gdb/doc/gdb.info-7
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-7	2019-04-16 02:07:26.000000000 +0000
+++ ./gdb/doc/gdb.info-7	2019-04-23 02:07:10.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-8 ./gdb/doc/gdb.info-8
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdb.info-8	2019-04-16 02:07:26.000000000 +0000
+++ ./gdb/doc/gdb.info-8	2019-04-23 02:07:11.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190416-git.
+Source-Level Debugger' for GDB (GDB) Version 8.2.91.20190423-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdbinit.5 ./gdb/doc/gdbinit.5
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdbinit.5	2019-04-16 02:07:30.000000000 +0000
+++ ./gdb/doc/gdbinit.5	2019-04-23 02:07:16.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBINIT 5"
-.TH GDBINIT 5 "2019-04-16" "gdb-8.2.91.20190416-git" "GNU Development Tools"
+.TH GDBINIT 5 "2019-04-23" "gdb-8.2.91.20190423-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdbserver.1 ./gdb/doc/gdbserver.1
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/doc/gdbserver.1	2019-04-16 02:07:29.000000000 +0000
+++ ./gdb/doc/gdbserver.1	2019-04-23 02:07:15.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBSERVER 1"
-.TH GDBSERVER 1 "2019-04-16" "gdb-8.2.91.20190416-git" "GNU Development Tools"
+.TH GDBSERVER 1 "2019-04-23" "gdb-8.2.91.20190423-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/inferior.h ./gdb/inferior.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/inferior.h	2019-04-16 02:03:56.000000000 +0000
+++ ./gdb/inferior.h	2019-04-23 02:03:41.000000000 +0000
@@ -68,7 +68,19 @@ struct infcall_suspend_state_deleter
 {
   void operator() (struct infcall_suspend_state *state) const
   {
-    restore_infcall_suspend_state (state);
+    TRY
+      {
+	restore_infcall_suspend_state (state);
+      }
+    CATCH (e, RETURN_MASK_ALL)
+      {
+	/* If we are restoring the inferior state due to an exception,
+	   some error message will be printed.  So, only warn the user
+	   when we cannot restore during normal execution.  */
+	if (!std::uncaught_exception ())
+	  warning (_("Failed to restore inferior state: %s"), e.message);
+      }
+    END_CATCH
   }
 };
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/po/gdb.pot ./gdb/po/gdb.pot
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/po/gdb.pot	2019-04-16 02:07:02.000000000 +0000
+++ ./gdb/po/gdb.pot	2019-04-23 02:06:43.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-16 02:07+0000\n"
+"POT-Creation-Date: 2019-04-23 02:06+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6087,11 +6087,11 @@ msgstr ""
 msgid "Print list of commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1762 top.c:1851
+#: cli/cli-cmds.c:1762 top.c:1860
 msgid "Set verbosity."
 msgstr ""
 
-#: cli/cli-cmds.c:1763 top.c:1852
+#: cli/cli-cmds.c:1763 top.c:1861
 msgid "Show verbosity."
 msgstr ""
 
@@ -16102,6 +16102,11 @@ msgstr ""
 msgid "Show printing of inferior events (e.g., inferior start and exit)."
 msgstr ""
 
+#: inferior.h:81
+#, possible-c-format
+msgid "Failed to restore inferior state: %s"
+msgstr ""
+
 #: inf-loop.c:91
 msgid "Event type not recognized.\n"
 msgstr ""
@@ -27097,65 +27102,65 @@ msgstr ""
 msgid "Line number %d out of range; %s has %d lines."
 msgstr ""
 
-#: source.c:1472
+#: source.c:1476
 msgid "No line number information available"
 msgstr ""
 
 #. Is there any case in which we get here, and have an address
 #. which the user would want to see?  If we have debugging symbols
 #. and no line numbers?
-#: source.c:1532
+#: source.c:1536
 #, possible-c-format
 msgid "Line number %d is out of range for \"%s\".\n"
 msgstr ""
 
-#: source.c:1565
+#: source.c:1569
 msgid "Expression not found"
 msgstr ""
 
-#: source.c:1627
+#: source.c:1631
 msgid "Expression not found\n"
 msgstr ""
 
-#: source.c:1744
+#: source.c:1748
 msgid "Too many arguments in command"
 msgstr ""
 
-#: source.c:1753
+#: source.c:1757
 #, possible-c-format
 msgid "Source path substitution rule matching `%s':\n"
 msgstr ""
 
-#: source.c:1755
+#: source.c:1759
 msgid "List of all source path substitution rules:\n"
 msgstr ""
 
-#: source.c:1778 source.c:1829
+#: source.c:1782 source.c:1833
 msgid "Incorrect usage, too many arguments in command"
 msgstr ""
 
-#: source.c:1788
+#: source.c:1792
 msgid "Delete all source path substitution rules? "
 msgstr ""
 
-#: source.c:1789
+#: source.c:1793
 msgid "Canceled"
 msgstr ""
 
-#: source.c:1811
+#: source.c:1815
 #, possible-c-format
 msgid "No substitution rule defined for `%s'"
 msgstr ""
 
-#: source.c:1826
+#: source.c:1830
 msgid "Incorrect usage, too few arguments in command"
 msgstr ""
 
-#: source.c:1832
+#: source.c:1836
 msgid "First argument must be at least one character long"
 msgstr ""
 
-#: source.c:1894
+#: source.c:1898
 msgid ""
 "Add directory DIR to beginning of search path for source files.\n"
 "Forget cached info on source file locations and line positions.\n"
@@ -27164,15 +27169,15 @@ msgid ""
 "With no argument, reset the search path to $cdir:$cwd, the default."
 msgstr ""
 
-#: source.c:1910
+#: source.c:1914
 msgid "Set the search path for finding source files."
 msgstr ""
 
-#: source.c:1912
+#: source.c:1916
 msgid "Show the search path for finding source files."
 msgstr ""
 
-#: source.c:1914
+#: source.c:1918
 msgid ""
 "$cwd in the path means the current working directory.\n"
 "$cdir in the path means the compilation directory of the source file.\n"
@@ -27181,11 +27186,11 @@ msgid ""
 "Setting the value to an empty string sets it to $cdir:$cwd, the default."
 msgstr ""
 
-#: source.c:1925
+#: source.c:1929
 msgid "Information about the current source file."
 msgstr ""
 
-#: source.c:1927
+#: source.c:1931
 msgid ""
 "Core addresses of the code for a source line.\n"
 "Line can be specified as\n"
@@ -27200,35 +27205,35 @@ msgid ""
 "The address is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:1939
+#: source.c:1943
 msgid ""
 "Search for regular expression (see regex(3)) from last line listed.\n"
 "The matching line number is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:1945
+#: source.c:1949
 msgid ""
 "Search backward for regular expression (see regex(3)) from last line "
 "listed.\n"
 "The matching line number is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:1950
+#: source.c:1954
 msgid "Set number of source lines gdb will list by default."
 msgstr ""
 
-#: source.c:1951
+#: source.c:1955
 msgid "Show number of source lines gdb will list by default."
 msgstr ""
 
-#: source.c:1952
+#: source.c:1956
 msgid ""
 "Use this to choose how many source lines the \"list\" displays (unless\n"
 "the \"list\" argument explicitly specifies some other number).\n"
 "A value of \"unlimited\", or zero, means there's no limit."
 msgstr ""
 
-#: source.c:1961
+#: source.c:1965
 msgid ""
 "Usage: set substitute-path FROM TO\n"
 "Add a substitution rule replacing FROM into TO in source file names.\n"
@@ -27236,7 +27241,7 @@ msgid ""
 "is replaced by the new one."
 msgstr ""
 
-#: source.c:1969
+#: source.c:1973
 msgid ""
 "Usage: unset substitute-path [FROM]\n"
 "Delete the rule for substituting FROM in source file names.  If FROM\n"
@@ -27244,22 +27249,22 @@ msgid ""
 "If the debugger cannot find a rule for FROM, it will display a warning."
 msgstr ""
 
-#: source.c:1977
+#: source.c:1981
 msgid ""
 "Usage: show substitute-path [FROM]\n"
 "Print the rule for substituting FROM in source file names. If FROM\n"
 "is not specified, print all substitution rules."
 msgstr ""
 
-#: source.c:1985
+#: source.c:1989
 msgid "Set how to display filenames."
 msgstr ""
 
-#: source.c:1986
+#: source.c:1990
 msgid "Show how to display filenames."
 msgstr ""
 
-#: source.c:1987
+#: source.c:1991
 msgid ""
 "filename-display can be:\n"
 "  basename - display only basename of a filename\n"
@@ -30160,110 +30165,118 @@ msgid "             --without-guile\n"
 msgstr ""
 
 #: top.c:1453
+msgid "             --enable-source-highlight\n"
+msgstr ""
+
+#: top.c:1457
+msgid "             --disable-source-highlight\n"
+msgstr ""
+
+#: top.c:1462
 #, possible-c-format
 msgid "             --with-relocated-sources=%s\n"
 msgstr ""
 
-#: top.c:1458
+#: top.c:1467
 #, possible-c-format
 msgid "             --with-separate-debug-dir=%s%s\n"
 msgstr ""
 
-#: top.c:1462
+#: top.c:1471
 #, possible-c-format
 msgid "             --with-sysroot=%s%s\n"
 msgstr ""
 
-#: top.c:1466
+#: top.c:1475
 #, possible-c-format
 msgid "             --with-system-gdbinit=%s%s\n"
 msgstr ""
 
 #. We assume "relocatable" will be printed at least once, thus we always
 #. print this text.  It's a reasonably safe assumption for now.
-#: top.c:1471
+#: top.c:1480
 msgid ""
 "\n"
 "(\"Relocatable\" means the directory can be moved with the GDB installation\n"
 "tree, and GDB will still find it.)\n"
 msgstr ""
 
-#: top.c:1550
+#: top.c:1559
 #, possible-c-format
 msgid "\tInferior %d [%s] will be detached.\n"
 msgstr ""
 
-#: top.c:1554
+#: top.c:1563
 #, possible-c-format
 msgid "\tInferior %d [%s] will be killed.\n"
 msgstr ""
 
-#: top.c:1573
+#: top.c:1582
 msgid ""
 "A debugging session is active.\n"
 "\n"
 msgstr ""
 
-#: top.c:1575
+#: top.c:1584
 msgid ""
 "\n"
 "Quit anyway? "
 msgstr ""
 
-#: top.c:1817
+#: top.c:1826
 msgid "\"set history\" must be followed by the name of a history subcommand.\n"
 msgstr ""
 
-#: top.c:1846
+#: top.c:1855
 msgid "Set verbose printing of informational messages."
 msgstr ""
 
-#: top.c:1847
+#: top.c:1856
 msgid "Show verbose printing of informational messages."
 msgstr ""
 
-#: top.c:1932
+#: top.c:1941
 #, possible-c-format
 msgid "Gdb's prompt is \"%s\".\n"
 msgstr ""
 
-#: top.c:1950
+#: top.c:1959
 #, possible-c-format
 msgid "Editing of command lines as they are typed is %s.\n"
 msgstr ""
 
-#: top.c:1952
+#: top.c:1961
 msgid "on"
 msgstr ""
 
-#: top.c:1952
+#: top.c:1961
 msgid "off"
 msgstr ""
 
-#: top.c:1959
+#: top.c:1968
 #, possible-c-format
 msgid "Annotation_level is %s.\n"
 msgstr ""
 
-#: top.c:1966
+#: top.c:1975
 #, possible-c-format
 msgid "Notification of completion for asynchronous execution commands is %s.\n"
 msgstr ""
 
-#: top.c:1989
+#: top.c:1998
 #, possible-c-format
 msgid "GDB's data directory is \"%s\".\n"
 msgstr ""
 
-#: top.c:2034
+#: top.c:2043
 msgid "Set gdb's prompt"
 msgstr ""
 
-#: top.c:2035
+#: top.c:2044
 msgid "Show gdb's prompt"
 msgstr ""
 
-#: top.c:2040
+#: top.c:2049
 msgid ""
 "Don't repeat this command.\n"
 "Primarily used inside of user-defined commands that should not be repeated "
@@ -30271,44 +30284,44 @@ msgid ""
 "hitting return."
 msgstr ""
 
-#: top.c:2046
+#: top.c:2055
 msgid "Set editing of command lines as they are typed."
 msgstr ""
 
-#: top.c:2047
+#: top.c:2056
 msgid "Show editing of command lines as they are typed."
 msgstr ""
 
-#: top.c:2048
+#: top.c:2057
 msgid ""
 "Use \"on\" to enable the editing, and \"off\" to disable it.\n"
 "Without an argument, command line editing is enabled.  To edit, use\n"
 "EMACS-like or VI-like commands like control-P or ESC."
 msgstr ""
 
-#: top.c:2056
+#: top.c:2065
 msgid "Set saving of the history record on exit."
 msgstr ""
 
-#: top.c:2057
+#: top.c:2066
 msgid "Show saving of the history record on exit."
 msgstr ""
 
-#: top.c:2058
+#: top.c:2067
 msgid ""
 "Use \"on\" to enable the saving, and \"off\" to disable it.\n"
 "Without an argument, saving is enabled."
 msgstr ""
 
-#: top.c:2066
+#: top.c:2075
 msgid "Set the size of the command history,"
 msgstr ""
 
-#: top.c:2067
+#: top.c:2076
 msgid "Show the size of the command history,"
 msgstr ""
 
-#: top.c:2068
+#: top.c:2077
 msgid ""
 "ie. the number of previous commands to keep a record of.\n"
 "If set to \"unlimited\", the number of commands kept in the history\n"
@@ -30316,15 +30329,15 @@ msgid ""
 "variable \"GDBHISTSIZE\", or to 256 if this variable is not set."
 msgstr ""
 
-#: top.c:2078
+#: top.c:2087
 msgid "Set how far back in history to look for and remove duplicate entries."
 msgstr ""
 
-#: top.c:2079
+#: top.c:2088
 msgid "Show how far back in history to look for and remove duplicate entries."
 msgstr ""
 
-#: top.c:2080
+#: top.c:2089
 msgid ""
 "If set to a nonzero value N, GDB will look back at the last N history "
 "entries\n"
@@ -30336,73 +30349,73 @@ msgid ""
 "By default this option is set to 0."
 msgstr ""
 
-#: top.c:2092
+#: top.c:2101
 msgid "Set the filename in which to record the command history"
 msgstr ""
 
-#: top.c:2093
+#: top.c:2102
 msgid "Show the filename in which to record the command history"
 msgstr ""
 
-#: top.c:2094
+#: top.c:2103
 msgid "(the list of previous commands of which a record is kept)."
 msgstr ""
 
-#: top.c:2100
+#: top.c:2109
 msgid "Set whether to confirm potentially dangerous operations."
 msgstr ""
 
-#: top.c:2101
+#: top.c:2110
 msgid "Show whether to confirm potentially dangerous operations."
 msgstr ""
 
-#: top.c:2107
+#: top.c:2116
 msgid "Set annotation_level."
 msgstr ""
 
-#: top.c:2108
+#: top.c:2117
 msgid "Show annotation_level."
 msgstr ""
 
-#: top.c:2109
+#: top.c:2118
 msgid ""
 "0 == normal;     1 == fullname (for use when running under emacs)\n"
 "2 == output annotated suitably for use by programs that control GDB."
 msgstr ""
 
-#: top.c:2117
+#: top.c:2126
 msgid "Set notification of completion for asynchronous execution commands."
 msgstr ""
 
-#: top.c:2118
+#: top.c:2127
 msgid "Show notification of completion for asynchronous execution commands."
 msgstr ""
 
-#: top.c:2119
+#: top.c:2128
 msgid "Use \"on\" to enable the notification, and \"off\" to disable it."
 msgstr ""
 
-#: top.c:2126
+#: top.c:2135
 msgid "Set GDB's data directory."
 msgstr ""
 
-#: top.c:2127
+#: top.c:2136
 msgid "Show GDB's data directory."
 msgstr ""
 
-#: top.c:2128
+#: top.c:2137
 msgid "When set, GDB uses the specified path to search for data files."
 msgstr ""
 
-#: top.c:2135
+#: top.c:2144
 msgid "Set whether GDB's standard input is a terminal."
 msgstr ""
 
-#: top.c:2136
+#: top.c:2145
 msgid "Show whether GDB's standard input is a terminal."
 msgstr ""
 
-#: top.c:2137
+#: top.c:2146
 msgid ""
 "If on, GDB assumes that standard input is a terminal.  In practice, it\n"
 "means that GDB should wait for the user to answer queries associated to\n"
@@ -30412,7 +30425,7 @@ msgid ""
 "input settings."
 msgstr ""
 
-#: top.c:2148
+#: top.c:2157
 msgid ""
 "Create a new UI.  It takes two arguments:\n"
 "The first argument is the name of the interpreter to run.\n"
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/source.c ./gdb/source.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/source.c	2019-04-16 02:03:56.000000000 +0000
+++ ./gdb/source.c	2019-04-23 02:03:41.000000000 +0000
@@ -1368,7 +1368,7 @@ print_source_lines_base (struct symtab *
 	      char c = *iter;
 	      if (c == '\033' && skip_ansi_escape (iter, &skip_bytes))
 		iter += skip_bytes;
-	      else if (c < 040 && c != '\t')
+	      else if (c >= 0 && c < 040 && c != '\t')
 		break;
 	      else if (c == 0177)
 		break;
@@ -1397,9 +1397,13 @@ print_source_lines_base (struct symtab *
 	    {
 	      xsnprintf (buf, sizeof (buf), "^%c", *iter + 0100);
 	      uiout->text (buf);
+	      ++iter;
 	    }
 	  else if (*iter == 0177)
-	    uiout->text ("^?");
+	    {
+	      uiout->text ("^?");
+	      ++iter;
+	    }
 	}
       uiout->text ("\n");
     }
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/testsuite/ChangeLog ./gdb/testsuite/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/testsuite/ChangeLog	2019-04-16 02:03:56.000000000 +0000
+++ ./gdb/testsuite/ChangeLog	2019-04-23 02:03:41.000000000 +0000
@@ -1,3 +1,8 @@
+2019-04-19  Tom Tromey  <tromey@adacore.com>
+
+	PR symtab/24423:
+	* gdb.base/list0.h (foo): Add a control-l character.
+
 2019-03-28  Pedro Alves  <palves@redhat.com>
 
 	* lib/gdb.exp (gdb_test_multiple): Split appends to $code and
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/testsuite/gdb.base/list0.h ./gdb/testsuite/gdb.base/list0.h
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/testsuite/gdb.base/list0.h	2019-04-16 02:03:57.000000000 +0000
+++ ./gdb/testsuite/gdb.base/list0.h	2019-04-23 02:03:42.000000000 +0000
@@ -3,7 +3,7 @@
 extern void bar(int);
 static void foo (int x)
 /* !
-   !
+
    ! */
 {
     bar (x++);
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/top.c ./gdb/top.c
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/gdb/top.c	2019-04-16 02:03:57.000000000 +0000
+++ ./gdb/top.c	2019-04-23 02:03:42.000000000 +0000
@@ -1449,6 +1449,15 @@ This GDB was configured as follows:\n\
              --without-guile\n\
 "));
 #endif
+#if HAVE_SOURCE_HIGHLIGHT
+  fprintf_filtered (stream, _("\
+             --enable-source-highlight\n\
+"));
+#else
+  fprintf_filtered (stream, _("\
+             --disable-source-highlight\n\
+"));
+#endif
 #ifdef RELOC_SRCDIR
   fprintf_filtered (stream, _("\
              --with-relocated-sources=%s\n\
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/md5.sum ./md5.sum
--- /sourceware/snapshot-tmp/gdb/snapshot/branch-gdb/update-snapshot/old/gdb-8.2.91.20190416/md5.sum	2019-04-16 02:07:36.000000000 +0000
+++ ./md5.sum	2019-04-23 02:07:24.000000000 +0000
@@ -37,7 +37,7 @@ bd4de43d501a0122abfcdc4688b01e31  bfd/el
 5cb0eef365977eb8c7430c04738a9e2c  bfd/wasm-module.c
 ce93ef6cd4c0ba0799b9d6d75b36638a  bfd/elf64-mips.c
 b37d897448eff4755757f07efebbc65a  bfd/cpu-m9s12x.c
-6b1822a1b2efcac2f4bf99aeb104ed89  bfd/version.h
+66131a437d3d23b00e088cbb2f9e545f  bfd/version.h
 322946e96d5fee9d690560285c8819bb  bfd/cpu-tilegx.c
 f2af796af1efd1971472837a26010b6f  bfd/coff-mcore.c
 8c9afc1c8aacf8206acc713b4332386e  bfd/cpu-avr.c
@@ -906,7 +906,7 @@ b9e37887328afb11383c8654d13b2b0f  gdb/ft
 c030bcc321482c62967e0ce5dc79960a  gdb/c-typeprint.c
 ee45c48e735a7277d3379b8e87a26d03  gdb/xtensa-tdep.c
 80cc6dcbb734b3b99ea3fb116723d736  gdb/or1k-linux-tdep.c
-8177f443409c5b44e2d4a41a849790cd  gdb/top.c
+85e7ac45bb562037c73e5034e0529ec4  gdb/top.c
 8d79f8f089a47be11386029a964cfa99  gdb/python/py-record-full.h
 48da199aadabf564524e4b8c7eb274d4  gdb/python/py-cmd.c
 a1cdb2262a93f3ee0941ea9b4ff485a6  gdb/python/py-infthread.c
@@ -1118,7 +1118,7 @@ f96ec051001a7877da7f6811b815affc  gdb/cl
 cf33608794c43e4e1a21029050cc2331  gdb/cp-namespace.c
 21b85dc2ed09d1125c8ab4fbdb043c7a  gdb/notify.defs
 82899e567314d0cadf3c96f25d6548eb  gdb/bsd-uthread.h
-90c7dff94f7575b0b9067f3686eba8e4  gdb/inferior.h
+2908589b617b39f270bcc21a51fad561  gdb/inferior.h
 123020c82ab80c6c777cbff26d3f4c1b  gdb/csky-tdep.h
 1fd63a67946e65e50c4e9ea89a7714d8  gdb/reggroups.h
 0995979778608fe7203391a85d13e743  gdb/copying.awk
@@ -1141,7 +1141,7 @@ bebbbee485593cc140000224d8f3dbc7  gdb/ui
 6527ed03737e27b2fe7c9d6c7991507c  gdb/user-regs.h
 ff6f680f23dad45d62b0b88e006cd1da  gdb/PROBLEMS
 649170fc694dc023a2da0de14d015ab2  gdb/config.in
-85624c6d680ed87cc6ed5d7950f456ed  gdb/configure.ac
+36ebb20a069d0d299b87c1da7aa21cca  gdb/configure.ac
 752cc726423f319218ee7048b5dc7d38  gdb/ChangeLog-2015
 eea1809f457e2b7085b09b44f347080b  gdb/amd64-sol2-tdep.c
 bde1387129ecbdca90c46533477f4830  gdb/vax-tdep.c
@@ -3168,7 +3168,7 @@ cdd15c08822addc10c8eb4b80781f306  gdb/te
 30c572e2cc60776dada2d132d8d93d4a  gdb/testsuite/gdb.base/type-opaque-lib.c
 815c2b51defc4bdd94f8385a8335d2b1  gdb/testsuite/gdb.base/quit.exp
 6d5713b512338a698cc63cef54551706  gdb/testsuite/gdb.base/vla-optimized-out.exp
-7370531a02fb52212e3639944b2d4a9d  gdb/testsuite/gdb.base/list0.h
+d3bc4c3a8498bcc2aa6968c536162cde  gdb/testsuite/gdb.base/list0.h
 a2a2f8a2e22600ab0d6afc17401d77b7  gdb/testsuite/gdb.base/jit-simple-jit.c
 7eb1e24100d40d57bdd6a581e9d55ad2  gdb/testsuite/gdb.base/unwindonsignal.c
 533a557ad6eb80b8e97447b13d66a39d  gdb/testsuite/gdb.base/osabi.exp
@@ -4447,7 +4447,7 @@ f29f2948a0d394bdb0f7445dccf1e1bd  gdb/te
 a73456a413ec206c45a1c05bede47b75  gdb/testsuite/gdb.go/integers.exp
 68d17058fa82304a192749f0eadc138d  gdb/testsuite/gdb.go/strings.go
 81b7ed6cb92c627d245bd2efc4b953b9  gdb/testsuite/gdb.go/methods.go
-376475517c8a427e98db4ad73d544c08  gdb/testsuite/ChangeLog
+6aea3cd0dfe66e38b39eedef5d1af736  gdb/testsuite/ChangeLog
 b3f11b21e5921c419a43f93720dedf85  gdb/testsuite/gdb.asm/empty.inc
 a331ee70db75cabf8b9cd7fbc60b8f01  gdb/testsuite/gdb.asm/asm-source.exp
 f1621bbbb2acbec5adef86d7d9549975  gdb/testsuite/gdb.asm/bfin.inc
@@ -5234,44 +5234,44 @@ fc41122ade5af8a08f4674de7e688c82  gdb/te
 459e75a5e7c0e390d002487df5ec0686  gdb/f-valprint.c
 b4661232e1c651351e7aab789eebdb61  gdb/gdb_curses.h
 8108dd8f906f2654fecc74958cf383db  gdb/doc/psrc.sed
-4e1d5806818be2319ec031baed1514d8  gdb/doc/gdb.info-3
-ef69fae87a0b687e1f9cba6910e8d111  gdb/doc/gdb.info-4
+482d447f6cf64073401a037f57ed91db  gdb/doc/gdb.info-3
+75e3ae1922ab57535436d4c5116ec556  gdb/doc/gdb.info-4
 ab0fe311032294b952da80585b8b90e7  gdb/doc/fdl.texi
 802a49cf1c011444ff9fcd9aec9f9b44  gdb/doc/Makefile.in
-86dd1cb27e16768305241f9ab4eb9511  gdb/doc/gdb.info-7
-dcafd678686198c5cf9dd0f24c3f53b6  gdb/doc/gdbserver.1
+6e50936ffa979e816695c8f59831635d  gdb/doc/gdb.info-7
+effb3092f17386b9626755896e1efbe7  gdb/doc/gdbserver.1
 014cd4fd1104288dfc4c674c1537656a  gdb/doc/guile.texi
 f81a0e00e0cb9e41b078069fb9bedb07  gdb/doc/stack_frame.txt
 a07e6b7f88c558d15d03adeeaca94c74  gdb/doc/stabs.info
-ef3a11d11024759dbd3bc5e769dd3189  gdb/doc/gdb.info-5
-e763c5c7cc5b205f06d10119d1bb2ba9  gdb/doc/gdb.info-8
+a5f7553cdfc4482450c69968b8828ab0  gdb/doc/gdb.info-5
+58151e69762cdee57278b4a13b101015  gdb/doc/gdb.info-8
 9137c9e47e1692b8efec8e28482aa6fb  gdb/doc/agentexpr.texi
 66674dc351ba95941f422dc18cae24bb  gdb/doc/.gitignore
-335cf318d25826275d7da3ef8e7df95b  gdb/doc/gdb.info-1
+8e6e86343c04e99da7a93aae4f7a0ee3  gdb/doc/gdb.info-1
 d5d06eaf9b4d44aa442a4a281aa9aea4  gdb/doc/a4rc.sed
-971deba7a65f2dde08dbfd6aa87b7019  gdb/doc/gdb.info-6
+a845d9e353a8b465e79c7223d64e026a  gdb/doc/gdb.info-6
 142e740d5daf2ecfedf9162c1611f888  gdb/doc/gdb.texinfo
-0dd35cc7a04b2eb6621e0ac0c6d57452  gdb/doc/gdb-add-index.1
+14ba0487157bd81ab14051d16b6b68c9  gdb/doc/gdb-add-index.1
 553b7fe1bf4b5d8b96fdb8cd83503de1  gdb/doc/stack_frame.svg
 04c82b1da7e894a6555868e4f86225af  gdb/doc/filter-for-doxygen
 5a0374965ab816741c91c7eaea412912  gdb/doc/Doxyfile-gdb-api.in
 ee0e2b0db5950ca1bee6412b68f43a7b  gdb/doc/annotate.info
-4cf6502ceecd4f951aefa091016480a6  gdb/doc/gdb.info-2
+2655a4e8e69ecc228b2d7241ecc03926  gdb/doc/gdb.info-2
 fdd79e6125e56c1eb7e28b2a71d5b48e  gdb/doc/refcard.tex
 6076d300a46651562d4ecd0604442414  gdb/doc/stack_frame.png
-d1b03846f4dc932a0839b228e5136b3f  gdb/doc/gdb.info
+29da4137a1357827988834da3ec28cc5  gdb/doc/gdb.info
 2c295a1962d15c01f3225686355fc1cd  gdb/doc/python.texi
 3b39212c16d58cf203006a2a3c3edcd4  gdb/doc/stabs.texinfo
 5ff9fdcc735e5b0839a1e73166c7d426  gdb/doc/ChangeLog
-a625b13bb28d4061a550ea14977248f5  gdb/doc/gdb.1
-6bbedab593710c7403b4c0728560eb12  gdb/doc/gcore.1
+059558a53a89980186a057f5e9637ac9  gdb/doc/gdb.1
+247e4ef8761999d6dff8bdb826f0ad21  gdb/doc/gcore.1
 d39233c86ed6a6dc9e853ae6a11fe03e  gdb/doc/stack_frame.pdf
 cb7ea97486937341d6ae27968ee40d23  gdb/doc/Doxyfile-base.in
 29393ec87c7921291f54ee7b57ccb1d9  gdb/doc/all-cfg.texi
 bf96494e6e4d346175babd5ef9781882  gdb/doc/gpl.texi
 cd5e3faa9bd1b684a73c7d527cdb4988  gdb/doc/filter-params.pl
 7bfdb0765c5d050d204fbb30aeeba0d8  gdb/doc/stack_frame.eps
-94bf703441f1147e42e5ab848ccaba8d  gdb/doc/gdbinit.5
+303079ac06a44afd9c3c2aca32cf42f2  gdb/doc/gdbinit.5
 24d4f8b6396da16d9a8dd98281ac40ff  gdb/doc/Doxyfile-gdb-xref.in
 ef8137a9704ed726a8789194c61ea0b2  gdb/doc/annotate.texinfo
 0b3e26fe6db92700f1e51071ff475193  gdb/doc/doxy-index.in
@@ -5361,7 +5361,7 @@ fa65e5caeea359892241390569065984  gdb/ft
 c7d501f0a9838e42152dd16d8197d5eb  gdb/tic6x-tdep.c
 652e9b357cacf96ad83c4cd7b134e146  gdb/gregset.h
 4594619e288942d09c6607822785d451  gdb/infcall.h
-cb37b9d8978498d536400d77ccf06d32  gdb/source.c
+ccef4b083115f106e0e6fadf1d1a302a  gdb/source.c
 e80bcdf714445215a7895be33ffe0f26  gdb/sparc64-linux-nat.c
 a6db388210216c6f1f8728e51808447e  gdb/build-id.h
 1c402e79019b00ef89f7dda0b55a80a8  gdb/xcoffread.c
@@ -5798,7 +5798,7 @@ c81ae04d92fde0d9e2e944cb645444e2  gdb/ad
 483ccde5d948c583be16475dabaec990  gdb/frame-unwind.c
 86b591c69a2d46259f9b419e51109187  gdb/acinclude.m4
 49a662a5b67ac1d2df6af5a686c2d7b8  gdb/arm-tdep.h
-79db61a04ac316d558898e4aa2a97405  gdb/configure
+b95db975ed303645fb6b134a865e0efd  gdb/configure
 f020083c2c369342c7c167e08d3643d3  gdb/main.h
 ddc035d4afa800a009283e06313117e4  gdb/alpha-tdep.c
 27d550cd6f34b024cebed42f3e18b44f  gdb/xml-tdesc.h
@@ -5817,7 +5817,7 @@ c4eaf5b604860c0d08f6a00621b2580c  gdb/va
 31d077fc2abf62a4660a4380051887ee  gdb/std-regs.c
 90d72be4c884a79ded08fa4fbbcb6b9b  gdb/go-lang.h
 9a1fd6216061720bf8556e23cf224721  gdb/i386-windows-nat.c
-a0c97596b72e5281d141023ea00f71a3  gdb/po/gdb.pot
+8c3d8ddc46d146e062c563c43557d227  gdb/po/gdb.pot
 1851bff0653201a488dcae18dde7efad  gdb/po/gdbtext
 105d24fd6d090c5a6aae5ad6edc1ca7a  gdb/break-catch-syscall.c
 81baef4f43368cc1c91885121b50fe67  gdb/ada-lang.c
@@ -5848,7 +5848,7 @@ e3e2430aebaf80b6aca6759cfa9612d4  gdb/nb
 0d0c57ad152cbb01e2a0ceb10a4ea141  gdb/i386-fbsd-nat.c
 abb75c402e1da7e6733b2bcb7a5c1e89  gdb/mipsread.c
 757ee1f1e523c2463dc477ec0ab1ded1  gdb/amd64-darwin-tdep.c
-77922ac6241425f26329a74607c31a7a  gdb/ChangeLog
+56b4777b68a495af370a8686541c34d5  gdb/ChangeLog
 2fd8f81fb260df7b31ffaaaa44e1d4b9  gdb/go-typeprint.c
 581f3a3f268b8c24e5e8493d06cb6c47  gdb/score-tdep.c
 73d6c33bc68e6fb265cf726d2ac15702  gdb/xml-support.h
