[PATCHv6] Fix range end handling of inlined subroutines

[Bernd Edlinger <bernd.edlinger@hotmail.de>]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

Hi,

this is it, what might fix Luis aarch64 tests hopefully, please confirm.

It still misses a good test case, though.

I attached both the fixed version of my inline end patch,
and a diff of the test results:

 + is results with 3349112e380712432d5818154d67ab4660af056f.
 - is results with this patch applied to above version.

I often have a hard time to tell which is a regression and which is
just because of transient errors, where test cases are not stable.

I hope this also helps with the Problem that Andrew is tackling
in the other patch, since I keep at least some line-entries as is-stmt
which were previously just deleted, or converted to non-is-stmt,
that is what makes the issue from the patch description.

This changes only line table entries that are at the same PC as
an end of inline function block.  Exactly that is the information
that is missing in the DWARF format, therefore it is not possible
to just fix gcc IMHO, we must fix the DWARF format, thus create
a new version, implement that in gcc and in gdb, that should tell
us what to do with the line entries at these special places.

Andrew, could you try this, if this patch fixes your problem,
or at least does not make it harder to fix?


Thanks
Bernd.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-range-end-handling-of-inlined-subroutines.patch --]
[-- Type: text/x-patch; name="0001-Fix-range-end-handling-of-inlined-subroutines.patch", Size: 14600 bytes --]

From 8d7b78a97daea5da74211a633f9e01bc9715d649 Mon Sep 17 00:00:00 2001
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Sun, 9 Feb 2020 21:13:17 +0100
Subject: [PATCH] Fix range end handling of inlined subroutines

Since the is_stmt is now handled, it becomes
possible to locate dubious is_stmt line entries
at the end of an inlined function, even if the
called inline function is in the same subfile.

When there is a sequence of line entries at the
same address where an inline range ends, and the
last item has is_stmt = 0, we force all previous
items to have is_stmt = 0 as well.

If the last line at that address has is_stmt = 1,
there is no need to change anything, since a step
over will always stop at that last line from the
same address, which is fine, since it is outside
the subroutine.

With this change we lose the ability to set
breakpoints on some lines using file:line syntax,
but the data is not completely lost, as the
line table is still holding those lines, just
with the is_stmt flag reset.

This is necessary as breakpoints on these lines
are problematic, as the call stack is often
wrong.  From the block info they appear to be
located in the caller, but they are actually meant
to be part of the subroutine, therefore usually one
frame is missing from the callstack when the
execution stops there.

This is about the best we can do at the moment,
unless location view information are added to the
block ranges debug info structure, and location
views are implemented in gdb in general.

This restores the previous behavior of
record_line that deletes lines at the end of
a function.

gdb:
2020-04-05  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* buildsym.c (buildsym_compunit::record_line): Delete
	previous lines at the same PC as the end sequence marker,
	but don't do that for a fake end sequence marker.
	(buildsym_compunit::record_inline_range_end,
	patch_inline_end_pos): New helper functions.
	(buildsym_compunit::end_symtab_with_blockvector): Patch line table.
	(buildsym_compunit::~buildsym_compunit): Cleanup m_inline_end_vector.
	* buildsym.h (buildsym_compunit::record_inline_range_end): Declare.
	(buildsym_compunit::m_inline_end_vector,
	buildsym_compunit::m_inline_end_vector_length,
	buildsym_compunit::m_inline_end_vector_nitems): New data items.
	* dwarf2/read.c (dwarf2_rnglists_process,
	dwarf2_ranges_process): Don't ignore empty ranges here.
	(dwarf2_ranges_read): Ignore empty ranges here.
	(dwarf2_record_block_ranges): Pass end of range PC to
	record_inline_range_end for inline functions.
	(dwarf_finish_line): Add new parameter end_sequence.
	(lnp_state_machine::record_line): Pass end_sequence to
	dwarf_finish_line.

gdb/testsuite:
2020-04-05  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* gdb.cp/step-and-next-inline.exp: Adjust test.
---
 gdb/buildsym.c                                | 124 ++++++++++++++++++++++----
 gdb/buildsym.h                                |  11 +++
 gdb/dwarf2/read.c                             |  30 ++++---
 gdb/testsuite/gdb.cp/step-and-next-inline.exp |  17 ----
 4 files changed, 135 insertions(+), 47 deletions(-)

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index fe07103..8c67e58 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -113,6 +113,8 @@ struct pending_block
       next1 = next->next;
       xfree ((void *) next);
     }
+
+  xfree (m_inline_end_vector);
 }
 
 struct macro_table *
@@ -691,30 +693,28 @@ struct blockvector *
 		      * sizeof (struct linetable_entry))));
     }
 
-  /* The end of sequence marker is special.  We need to reset the
-     is_stmt flag on previous lines at the same PC, otherwise these
-     lines may cause problems since they might be at the same address
-     as the following function.  For instance suppose a function calls
-     abort there is no reason to emit a ret after that point (no joke).
+  /* The end of sequence marker is special.  We need to delete any
+     previous lines at the same PC, otherwise these lines may cause
+     problems since they might be at the same address as the following
+     function.  For instance suppose a function calls abort there is no
+     reason to emit a ret after that point (no joke).
      So the label may be at the same address where the following
-     function begins.  A similar problem appears if a label is at the
-     same address where an inline function ends we cannot reliably tell
-     if this is considered part of the inline function or the calling
-     program or even the next inline function, so stack traces may
-     give surprising results.  Expect gdb.cp/step-and-next-inline.exp
-     to fail if these lines are not modified here.  */
-  if (line == 0 && subfile->line_vector->nitems > 0)
+     function begins.  There is also a fake end of sequence marker (-1)
+     that we emit internally when switching between different CUs
+     In this case, duplicate line table entries shall not be deleted.
+     But the line table entry looks the same in both cases.  */
+  if (line == 0)
     {
-      e = subfile->line_vector->item + subfile->line_vector->nitems;
-      do
+      while (subfile->line_vector->nitems > 0)
 	{
-	  e--;
-	  if (e->pc != pc || e->line == 0)
+	  e = subfile->line_vector->item + subfile->line_vector->nitems - 1;
+	  if (e->pc != pc)
 	    break;
-	  e->is_stmt = 0;
+	  subfile->line_vector->nitems--;
 	}
-      while (e > subfile->line_vector->item);
     }
+  else if (line == -1)
+    line = 0;
 
   e = subfile->line_vector->item + subfile->line_vector->nitems++;
   e->line = line;
@@ -723,6 +723,90 @@ struct blockvector *
 }
 
 \f
+/* Record a PC where a inlined subroutine ends.  */
+
+void
+buildsym_compunit::record_inline_range_end (CORE_ADDR end)
+{
+  /* The performance of this function is very important,
+     it shall be O(n*log(n)) therefore we do not use std::vector
+     here since some compilers, e.g. visual studio, do not
+     guarantee that for vector::push_back.  */
+  if (m_inline_end_vector == nullptr)
+    {
+      m_inline_end_vector_length = INITIAL_LINE_VECTOR_LENGTH;
+      m_inline_end_vector = (CORE_ADDR *)
+	xmalloc (sizeof (CORE_ADDR) * m_inline_end_vector_length);
+      m_inline_end_vector_nitems = 0;
+    }
+  else if (m_inline_end_vector_nitems == m_inline_end_vector_length)
+    {
+      m_inline_end_vector_length *= 2;
+      m_inline_end_vector = (CORE_ADDR *)
+	xrealloc ((char *) m_inline_end_vector,
+		  sizeof (CORE_ADDR) * m_inline_end_vector_length);
+    }
+
+  m_inline_end_vector[m_inline_end_vector_nitems++] = end;
+}
+
+\f
+/* Patch the is_stmt bits at the given inline end address.
+   The line table has to be already sorted.  */
+
+static void
+patch_inline_end_pos (struct linetable *table, CORE_ADDR end)
+{
+  int a = 2, b = table->nitems - 1;
+  struct linetable_entry *items = table->item;
+
+  /* We need at least two items with pc = end in the table.
+     The lowest usable items are at pos 0 and 1, the highest
+     usable items are at pos b - 2 and b - 1.  */
+  if (a > b || end < items[1].pc || end > items[b - 2].pc)
+    return;
+
+  /* Look for the first item with pc > end in the range [a,b].
+     The previous element has pc = end or there is no match.
+     We set a = 2, since we need at least two consecutive elements
+     with pc = end to do anything useful.
+     We set b = nitems - 1, since we are not interested in the last
+     element which should be an end of sequence marker with line = 0
+     and is_stmt = 1.  */
+  while (a < b)
+    {
+      int c = (a + b) / 2;
+
+      if (end < items[c].pc)
+	b = c;
+      else
+	a = c + 1;
+    }
+
+  a--;
+  if (items[a].pc != end || items[a].is_stmt)
+    return;
+
+  /* When there is a sequence of line entries at the same address
+     where an inline range ends, and the last item has is_stmt = 0,
+     we force all previous items to have is_stmt = 0 as well.
+     Setting breakpoints at those addresses is currently not
+     supported, since it is unclear if the previous addresses are
+     part of the subroutine or the calling program.  */
+  do
+    {
+      /* We stop at the first line entry with a different address,
+	 or when we see an end of sequence marker.  */
+      a--;
+      if (items[a].pc != end || items[a].line == 0)
+	break;
+
+      items[a].is_stmt = 0;
+    }
+  while (a > 0);
+}
+
+\f
 /* Subroutine of end_symtab to simplify it.  Look for a subfile that
    matches the main source file's basename.  If there is only one, and
    if the main source file doesn't have any symbol or line number
@@ -956,6 +1040,10 @@ struct compunit_symtab *
 			      subfile->line_vector->item
 			      + subfile->line_vector->nitems,
 			      lte_is_less_than);
+
+	   for (int i = 0; i < m_inline_end_vector_nitems; i++)
+	     patch_inline_end_pos (subfile->line_vector,
+				   m_inline_end_vector[i]);
 	}
 
       /* Allocate a symbol table if necessary.  */
diff --git a/gdb/buildsym.h b/gdb/buildsym.h
index c768a4c..2845789 100644
--- a/gdb/buildsym.h
+++ b/gdb/buildsym.h
@@ -190,6 +190,8 @@ struct buildsym_compunit
   void record_line (struct subfile *subfile, int line, CORE_ADDR pc,
 		    bool is_stmt);
 
+  void record_inline_range_end (CORE_ADDR end);
+
   struct compunit_symtab *get_compunit_symtab ()
   {
     return m_compunit_symtab;
@@ -397,6 +399,15 @@ struct buildsym_compunit
 
   /* Pending symbols that are local to the lexical context.  */
   struct pending *m_local_symbols = nullptr;
+
+  /* Pending inline end range addresses.  */
+  CORE_ADDR * m_inline_end_vector = nullptr;
+
+  /* Number of allocated inline end range addresses.  */
+  int m_inline_end_vector_length = 0;
+
+  /* Number of pending inline end range addresses.  */
+  int m_inline_end_vector_nitems = 0;
 };
 
 \f
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index bcc3116..aa32726 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -13527,10 +13527,6 @@ class process_die_scope
 	  return false;
 	}
 
-      /* Empty range entries have no effect.  */
-      if (range_beginning == range_end)
-	continue;
-
       range_beginning += *base;
       range_end += *base;
 
@@ -13638,10 +13634,6 @@ class process_die_scope
 	  return 0;
 	}
 
-      /* Empty range entries have no effect.  */
-      if (range_beginning == range_end)
-	continue;
-
       range_beginning += *base;
       range_end += *base;
 
@@ -13681,6 +13673,10 @@ class process_die_scope
   retval = dwarf2_ranges_process (offset, cu,
     [&] (CORE_ADDR range_beginning, CORE_ADDR range_end)
     {
+      /* Empty range entries have no effect.  */
+      if (range_beginning == range_end)
+	return;
+
       if (ranges_pst != NULL)
 	{
 	  CORE_ADDR lowpc;
@@ -13918,6 +13914,7 @@ class process_die_scope
   struct gdbarch *gdbarch = get_objfile_arch (objfile);
   struct attribute *attr;
   struct attribute *attr_high;
+  bool inlined_subroutine = (die->tag == DW_TAG_inlined_subroutine);
 
   attr_high = dwarf2_attr (die, DW_AT_high_pc, cu);
   if (attr_high)
@@ -13933,7 +13930,10 @@ class process_die_scope
 
 	  low = gdbarch_adjust_dwarf2_addr (gdbarch, low + baseaddr);
 	  high = gdbarch_adjust_dwarf2_addr (gdbarch, high + baseaddr);
-	  cu->get_builder ()->record_block_range (block, low, high - 1);
+	  if (inlined_subroutine)
+	    cu->get_builder ()->record_inline_range_end (high);
+	  if (low < high)
+	    cu->get_builder ()->record_block_range (block, low, high - 1);
         }
     }
 
@@ -13958,6 +13958,10 @@ class process_die_scope
 	  end += baseaddr;
 	  start = gdbarch_adjust_dwarf2_addr (gdbarch, start);
 	  end = gdbarch_adjust_dwarf2_addr (gdbarch, end);
+	  if (inlined_subroutine)
+	    cu->get_builder ()->record_inline_range_end (end);
+	  if (start == end)
+	    return;
 	  cu->get_builder ()->record_block_range (block, start, end - 1);
 	  blockvec.emplace_back (start, end);
 	});
@@ -19479,7 +19483,7 @@ class lnp_state_machine
 
 static void
 dwarf_finish_line (struct gdbarch *gdbarch, struct subfile *subfile,
-		   CORE_ADDR address, struct dwarf2_cu *cu)
+		   CORE_ADDR address, struct dwarf2_cu *cu, bool end_sequence)
 {
   if (subfile == NULL)
     return;
@@ -19492,7 +19496,8 @@ class lnp_state_machine
 			  paddress (gdbarch, address));
     }
 
-  dwarf_record_line_1 (gdbarch, subfile, 0, address, true, cu);
+  dwarf_record_line_1 (gdbarch, subfile, end_sequence ? 0 : -1, address,
+		       true, cu);
 }
 
 void
@@ -19525,7 +19530,8 @@ class lnp_state_machine
 	      || end_sequence)
 	    {
 	      dwarf_finish_line (m_gdbarch, m_last_subfile, m_address,
-				 m_currently_recording_lines ? m_cu : nullptr);
+				 m_currently_recording_lines ? m_cu : nullptr,
+				 end_sequence);
 	    }
 
 	  if (!end_sequence)
diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.exp b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
index 3733fa7..e3a5793 100644
--- a/gdb/testsuite/gdb.cp/step-and-next-inline.exp
+++ b/gdb/testsuite/gdb.cp/step-and-next-inline.exp
@@ -52,37 +52,20 @@ proc do_test { use_header } {
     gdb_test "step" ".*" "step into get_alias_set"
     gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 1"
-    # It's possible that this first failure (when not using a header
-    # file) is GCC's fault, though the remaining failures would best
-    # be fixed by adding location views support (though it could be
-    # that some easier heuristic could be figured out).  Still, it is
-    # not certain that the first failure wouldn't also be fixed by
-    # having location view support, so for now it is tagged as such.
-    if {!$use_header} { setup_kfail "*-*-*" symtab/25507 }
     gdb_test "next" ".*TREE_TYPE.*" "next step 1"
     gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 2"
     gdb_test "next" ".*TREE_TYPE.*" "next step 2"
     gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 3"
-    if {!$use_header} { setup_kfail "*-*-*" symtab/25507 }
     gdb_test "next" ".*TREE_TYPE.*" "next step 3"
     gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \
 	"not in inline 4"
-    if {!$use_header} { setup_kfail "*-*-*" symtab/25507 }
     gdb_test "next" "return 0.*" "next step 4"
     gdb_test "bt" \
 	"\\s*\\#0\\s+(main|get_alias_set)\[^\r\]*${srcfile}:.*" \
 	"not in inline 5"
 
-    if {!$use_header} {
-	# With the debug from GCC 10.x (and earlier) GDB is currently
-	# unable to successfully complete the following tests when we
-	# are not using a header file.
-	kfail symtab/25507 "stepping tests"
-	return
-    }
-
     clean_restart ${executable}
 
     if ![runto_main] {
-- 
1.9.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: test.diff --]
[-- Type: text/x-patch; name="test.diff", Size: 30054 bytes --]

--- /dev/fd/63	2020-04-05 04:14:05.929697173 +0200
+++ /dev/fd/62	2020-04-05 04:14:05.929697173 +0200
@@ -1,4 +1,4 @@
-Test Run By ed on Sun Apr  5 03:07:53 2020
+Test Run By ed on Sun Apr  5 03:45:11 2020
 Native configuration is x86_64-pc-linux-gnu
 
 		=== gdb tests ===
@@ -42091,7 +42091,7 @@
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-on: cont: thread 1
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-on: cont: thread 1: continue
 FAIL: gdb.btrace/multi-thread-step.exp: schedlock-on: cont: thread 1: thread 1 not replaying
-PASS: gdb.btrace/multi-thread-step.exp: schedlock-on: cont: thread 1: thread apply 2 info record
+FAIL: gdb.btrace/multi-thread-step.exp: schedlock-on: cont: thread 1: thread apply 2 info record
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-on: cont: thread 2
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-on: cont: thread 2: continue
 FAIL: gdb.btrace/multi-thread-step.exp: schedlock-on: cont: thread 2: thread 1 not replaying
@@ -42132,7 +42132,7 @@
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-replay: cont: thread 2
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-replay: cont: thread 2: continue
 FAIL: gdb.btrace/multi-thread-step.exp: schedlock-replay: cont: thread 2: thread 1 not replaying
-PASS: gdb.btrace/multi-thread-step.exp: schedlock-replay: cont: thread 2: thread 2 not replaying
+FAIL: gdb.btrace/multi-thread-step.exp: schedlock-replay: cont: thread 2: thread 2 not replaying
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-replay: goto-end: thread 1 not replaying
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-replay: goto-end: thread 2 not replaying
 PASS: gdb.btrace/multi-thread-step.exp: schedlock-replay: goto-end: thread apply all record goto end
@@ -42432,78 +42432,77 @@
 PASS: gdb.btrace/vdso.exp: replay: info record
 PASS: gdb.btrace/vdso.exp: replay: record goto begin
 PASS: gdb.btrace/vdso.exp: stepi
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code (*a.s.ptr != 'h')
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code (*a.s.ptr != 'h')
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: compile code (*anon_s.ptr == 'a') (PRMS: compile/23588)
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code A::BB
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code ABC
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code DEF
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code GHI
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code A::BB
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code ABC
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code DEF
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code GHI
 PASS: gdb.compile/compile-cplus-anonymous.exp: compile code JKL
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code a.e
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code a.s.len
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code a.u.b (timeout)
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code a.e
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code a.s.len
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code a.u.b
 FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code anon_e
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: compile code anon_s.MAGIC (PRMS: compile/23588)
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: compile code anon_s.len (PRMS: compile/23588)
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: compile code anon_s.ua (PRMS: compile/23588)
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile code anon_u.aa (timeout)
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print (*a.s.ptr != 'h')
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile code anon_u.aa
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile print (*a.s.ptr != 'h')
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: compile print (*anon_s.ptr == 'a') (PRMS: compile/23588)
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print A::BB
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile print A::BB
 PASS: gdb.compile/compile-cplus-anonymous.exp: compile print ABC
 PASS: gdb.compile/compile-cplus-anonymous.exp: compile print DEF
 PASS: gdb.compile/compile-cplus-anonymous.exp: compile print GHI
 PASS: gdb.compile/compile-cplus-anonymous.exp: compile print JKL
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print a.e
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print a.s.len
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print a.u.b
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print anon_e (timeout)
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile print a.e
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile print a.s.len
+PASS: gdb.compile/compile-cplus-anonymous.exp: compile print a.u.b
+FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print anon_e
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: compile print anon_s.MAGIC (PRMS: compile/23588)
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: compile print anon_s.len (PRMS: compile/23588)
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: compile print anon_s.ua (PRMS: compile/23588)
-FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print anon_u.aa (timeout)
+FAIL: gdb.compile/compile-cplus-anonymous.exp: compile print anon_u.aa
 PASS: gdb.compile/compile-cplus-anonymous.exp: continue to breakpoint: testing location
-FAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code (*a.s.ptr != 'h')
+PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code (*a.s.ptr != 'h')
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code (*anon_s.ptr == 'a') (PRMS: compile/23588)
-FAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code A::BB
-FAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code ABC
+PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code A::BB
+PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code ABC
 PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code DEF
 PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code GHI
 PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code JKL
-FAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code a.e
-FAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code a.s.len
-FAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code a.u.b
+PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code a.e
+PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code a.s.len
+PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code a.u.b
 FAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code anon_e
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code anon_s.MAGIC (PRMS: compile/23588)
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code anon_s.len (PRMS: compile/23588)
 KFAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code anon_s.ua (PRMS: compile/23588)
-FAIL: gdb.compile/compile-cplus-anonymous.exp: result of compile code anon_u.aa (timeout)
+PASS: gdb.compile/compile-cplus-anonymous.exp: result of compile code anon_u.aa
 PASS: gdb.compile/compile-cplus-array-decay.exp: compile print integers
 PASS: gdb.compile/compile-cplus-array-decay.exp: compile print strings
 PASS: gdb.compile/compile-cplus-array-decay.exp: continue to breakpoint: testing location
-FAIL: gdb.compile/compile-cplus-inherit.exp: check for working compile command (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile code d.A::do_it (1) (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile code d.B::do_it (1)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile code d.C::do_it (1)
+PASS: gdb.compile/compile-cplus-inherit.exp: compile code d.A::do_it (1)
+PASS: gdb.compile/compile-cplus-inherit.exp: compile code d.B::do_it (1)
+PASS: gdb.compile/compile-cplus-inherit.exp: compile code d.C::do_it (1)
 PASS: gdb.compile/compile-cplus-inherit.exp: compile code d.a_
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile code d.b_ (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile code d.c_ (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile code d.d_ (timeout)
+PASS: gdb.compile/compile-cplus-inherit.exp: compile code d.b_
+PASS: gdb.compile/compile-cplus-inherit.exp: compile code d.c_
+PASS: gdb.compile/compile-cplus-inherit.exp: compile code d.d_
 FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.A::do_it (1)
 FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.B::do_it (1)
 FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.C::do_it (1)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.a_ (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.b_ (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.c_ (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.d_ (timeout)
+FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.a_
+FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.b_
+FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.c_
+FAIL: gdb.compile/compile-cplus-inherit.exp: compile print d.d_
 PASS: gdb.compile/compile-cplus-inherit.exp: continue to breakpoint: testing location
-FAIL: gdb.compile/compile-cplus-inherit.exp: result of compile code d.A::do_it (1)
-FAIL: gdb.compile/compile-cplus-inherit.exp: result of compile code d.B::do_it (1)
-FAIL: gdb.compile/compile-cplus-inherit.exp: result of compile code d.C::do_it (1)
+PASS: gdb.compile/compile-cplus-inherit.exp: result of compile code d.A::do_it (1)
+PASS: gdb.compile/compile-cplus-inherit.exp: result of compile code d.B::do_it (1)
+PASS: gdb.compile/compile-cplus-inherit.exp: result of compile code d.C::do_it (1)
 PASS: gdb.compile/compile-cplus-inherit.exp: result of compile code d.a_
-FAIL: gdb.compile/compile-cplus-inherit.exp: result of compile code d.b_ (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: result of compile code d.c_ (timeout)
-FAIL: gdb.compile/compile-cplus-inherit.exp: result of compile code d.d_ (timeout)
+PASS: gdb.compile/compile-cplus-inherit.exp: result of compile code d.b_
+PASS: gdb.compile/compile-cplus-inherit.exp: result of compile code d.c_
+PASS: gdb.compile/compile-cplus-inherit.exp: result of compile code d.d_
 FAIL: gdb.compile/compile-cplus-member.exp: compile code A::ATYPE i = 10; var = i;
 FAIL: gdb.compile/compile-cplus-member.exp: compile code A::s_private_
 FAIL: gdb.compile/compile-cplus-member.exp: compile code A::s_private_ = E_B; var = A::s_private_;
@@ -42624,21 +42623,21 @@
 PASS: gdb.compile/compile-cplus-namespace.exp: result of compile code N1::N2::N3::N4::n4static
 PASS: gdb.compile/compile-cplus-namespace.exp: result of compile code s4.get_var ()
 PASS: gdb.compile/compile-cplus-namespace.exp: result of compile code s4.s4int_
-FAIL: gdb.compile/compile-cplus-nested.exp: compile code A::Inner1 &r1 = i1; var = r1.a_; (timeout)
-FAIL: gdb.compile/compile-cplus-nested.exp: compile code A::Inner1 *i1p = &i1; var = i1p->a_; (timeout)
+FAIL: gdb.compile/compile-cplus-nested.exp: compile code A::Inner1 &r1 = i1; var = r1.a_;
+FAIL: gdb.compile/compile-cplus-nested.exp: compile code A::Inner1 *i1p = &i1; var = i1p->a_;
 FAIL: gdb.compile/compile-cplus-nested.exp: compile code A::Inner1::Inner2 &r2 = i2; var = r2.a_;
-FAIL: gdb.compile/compile-cplus-nested.exp: compile code A::Inner1::Inner2 *i2p = &i2; var = i2p->a_; (timeout)
-FAIL: gdb.compile/compile-cplus-nested.exp: compile code i1.a_ (timeout)
-FAIL: gdb.compile/compile-cplus-nested.exp: compile code i2.a_ (timeout)
-FAIL: gdb.compile/compile-cplus-nested.exp: compile print i1.a_ (timeout)
-FAIL: gdb.compile/compile-cplus-nested.exp: compile print i2.a_ (timeout)
+FAIL: gdb.compile/compile-cplus-nested.exp: compile code A::Inner1::Inner2 *i2p = &i2; var = i2p->a_;
+FAIL: gdb.compile/compile-cplus-nested.exp: compile code i1.a_
+FAIL: gdb.compile/compile-cplus-nested.exp: compile code i2.a_
+FAIL: gdb.compile/compile-cplus-nested.exp: compile print i1.a_
+FAIL: gdb.compile/compile-cplus-nested.exp: compile print i2.a_
 PASS: gdb.compile/compile-cplus-nested.exp: continue to breakpoint: testing location
 FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code A::Inner1 &r1 = i1; var = r1.a_;
-FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code A::Inner1 *i1p = &i1; var = i1p->a_; (timeout)
+FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code A::Inner1 *i1p = &i1; var = i1p->a_;
 FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code A::Inner1::Inner2 &r2 = i2; var = r2.a_;
-FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code A::Inner1::Inner2 *i2p = &i2; var = i2p->a_; (timeout)
-FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code i1.a_ (timeout)
-FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code i2.a_ (timeout)
+FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code A::Inner1::Inner2 *i2p = &i2; var = i2p->a_;
+FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code i1.a_
+FAIL: gdb.compile/compile-cplus-nested.exp: result of compile code i2.a_
 PASS: gdb.compile/compile-cplus-print.exp: Set language to C++
 KFAIL: gdb.compile/compile-cplus-print.exp: compile print *vararray@3 (PRMS: compile/23587)
 KFAIL: gdb.compile/compile-cplus-print.exp: compile print *vararrayp@3 (PRMS: compile/23587)
@@ -49883,34 +49882,18 @@
 PASS: gdb.cp/static-print-quit.exp: set pagination off
 PASS: gdb.cp/static-print-quit.exp: set width 80
 PASS: gdb.cp/static-typedef-print.exp: print static member
-PASS: gdb.cp/step-and-next-inline.exp: no_header: in get_alias_set pass 2
-PASS: gdb.cp/step-and-next-inline.exp: no_header: in inline 1 pass 2
-PASS: gdb.cp/step-and-next-inline.exp: no_header: in inline 2 pass 2
-PASS: gdb.cp/step-and-next-inline.exp: no_header: in inline 3 pass 2
 PASS: gdb.cp/step-and-next-inline.exp: no_header: in main
-PASS: gdb.cp/step-and-next-inline.exp: no_header: in main pass 2
-PASS: gdb.cp/step-and-next-inline.exp: no_header: next step 1
+KFAIL: gdb.cp/step-and-next-inline.exp: no_header: next step 1 (PRMS: symtab/25507)
 PASS: gdb.cp/step-and-next-inline.exp: no_header: next step 2
-PASS: gdb.cp/step-and-next-inline.exp: no_header: next step 3
-PASS: gdb.cp/step-and-next-inline.exp: no_header: next step 4
+KFAIL: gdb.cp/step-and-next-inline.exp: no_header: next step 3 (PRMS: symtab/25507)
+KFAIL: gdb.cp/step-and-next-inline.exp: no_header: next step 4 (PRMS: symtab/25507)
 PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 1
-PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 1 pass 2
 PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 2
-PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 2 pass 2
 PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 3
-PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 3 pass 2
 PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 4
-PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 4 pass 2
 PASS: gdb.cp/step-and-next-inline.exp: no_header: not in inline 5
-PASS: gdb.cp/step-and-next-inline.exp: no_header: step 1
-PASS: gdb.cp/step-and-next-inline.exp: no_header: step 2
-PASS: gdb.cp/step-and-next-inline.exp: no_header: step 3
-PASS: gdb.cp/step-and-next-inline.exp: no_header: step 4
-PASS: gdb.cp/step-and-next-inline.exp: no_header: step 5
-PASS: gdb.cp/step-and-next-inline.exp: no_header: step 6
-PASS: gdb.cp/step-and-next-inline.exp: no_header: step 7
 PASS: gdb.cp/step-and-next-inline.exp: no_header: step into get_alias_set
-PASS: gdb.cp/step-and-next-inline.exp: no_header: step into get_alias_set pass 2
+KFAIL: gdb.cp/step-and-next-inline.exp: no_header: stepping tests (PRMS: symtab/25507)
 PASS: gdb.cp/step-and-next-inline.exp: use_header: in get_alias_set pass 2
 PASS: gdb.cp/step-and-next-inline.exp: use_header: in inline 1 pass 2
 PASS: gdb.cp/step-and-next-inline.exp: use_header: in inline 2 pass 2
@@ -66161,7 +66144,7 @@
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=attach: info inferiors
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=attach: info threads
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=attach: set schedule-multiple on
-FAIL: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=attach: stop with control-c (SIGINT)
+FAIL: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=attach: stop with control-c (SIGINT) (the program is no longer running)
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=attach: switch to inferior 2
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=run: add empty inferior 2
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=run: attach
@@ -66175,7 +66158,7 @@
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=tty: info inferiors
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=tty: info threads
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=tty: set schedule-multiple on
-FAIL: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=tty: stop with control-c (SIGINT)
+PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=tty: stop with control-c (SIGINT)
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=tty: switch to inferior 2
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=attach: inf2_how=tty: tty TTY
 PASS: gdb.multi/multi-term-settings.exp: inf1_how=run: inf2_how=attach: add empty inferior 2
@@ -74312,7 +74295,7 @@
 PASS: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: no failure to remove breakpoints
 PASS: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: no spurious thread stop
 PASS: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: no threads left
-PASS: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: only inferior 1 left
+FAIL: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: only inferior 1 left
 PASS: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: set detach-on-fork off
 PASS: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: successfully compiled posix threads test case
 PASS: gdb.threads/fork-plus-threads.exp: detach-on-fork=on: continue &
@@ -75041,7 +75024,7 @@
 PASS: gdb.threads/non-ldr-exc-4.exp: lock-sched=on,non-stop=off: set scheduler-locking on
 PASS: gdb.threads/non-ldr-exc-4.exp: successfully compiled posix threads test case
 PASS: gdb.threads/non-ldr-exit.exp: continue to breakpoint: break-here
-PASS: gdb.threads/non-ldr-exit.exp: program exits normally
+KFAIL: gdb.threads/non-ldr-exit.exp: program exits normally (PRMS: gdb/18717)
 PASS: gdb.threads/non-ldr-exit.exp: set scheduler-locking on
 PASS: gdb.threads/non-ldr-exit.exp: successfully compiled posix threads test case
 PASS: gdb.threads/non-stop-fair-events.exp: get num_threads
@@ -75553,48 +75536,48 @@
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: first thread: get valueof "thread_num"
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print file_scope_var
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i01
-PASS: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i02
+KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i02 (PRMS: gdb/22214)
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i11
-PASS: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i12
+KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i12 (PRMS: gdb/22214)
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i21
-PASS: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i22
+KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: first thread: print i22 (PRMS: gdb/22214)
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: continue to breakpoint: at printf
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: get valueof "thread_num"
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print file_scope_var
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i01
-KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i02 (PRMS: gdb/22214)
+PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i02
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i11
-KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i12 (PRMS: gdb/22214)
+PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i12
 PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i21
-KFAIL: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i22 (PRMS: gdb/22214)
+PASS: gdb.threads/omp-par-scope.exp: multi_scope: second thread: print i22
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: continue to breakpoint: at printf
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: get valueof "tn"
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print file_scope_var
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print i
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print j
-PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print k
+KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print k (PRMS: gdb/22214)
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print p
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print q
-PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print r
+KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print r (PRMS: gdb/22214)
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print s1
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print tn
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print x
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print y
-PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print z
+KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 1st thread: print z (PRMS: gdb/22214)
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: continue to breakpoint: at printf
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: get valueof "tn"
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print file_scope_var
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print i
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print j
-KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print k (PRMS: gdb/22214)
+PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print k
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print p
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print q
-KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print r (PRMS: gdb/22214)
+PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print r
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print s1
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print tn
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print x
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print y
-KFAIL: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print z (PRMS: gdb/22214)
+PASS: gdb.threads/omp-par-scope.exp: nested_func: 1st call: 2nd thread: print z
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 1st thread: continue to breakpoint: at printf
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 1st thread: get valueof "tn"
 PASS: gdb.threads/omp-par-scope.exp: nested_func: 2nd call: 1st thread: print file_scope_var
@@ -75638,8 +75621,8 @@
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 2nd stop: print file_scope_var
 KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 2nd stop: print i (PRMS: gdb/22214)
 KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 2nd stop: print j (PRMS: gdb/22214)
-PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 2nd stop: print k
-PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 2nd stop: print l
+XFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 2nd stop: print k
+XFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 2nd stop: print l
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 2nd stop: print num
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 3rd stop: continue to breakpoint: at printf
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 3rd stop: get valueof "inner_num"
@@ -75656,14 +75639,14 @@
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print file_scope_var
 KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print i (PRMS: gdb/22214)
 KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print j (PRMS: gdb/22214)
-XFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print k
-XFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print l
+PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print k
+PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print l
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: inner_threads: 4th stop: print num
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: continue to breakpoint: at printf
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: get local valueof "num"
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print file_scope_var
-KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print i (PRMS: gdb/22214)
-KFAIL: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print j (PRMS: gdb/22214)
+PASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print i
+PASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print j
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print k
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print l
 PASS: gdb.threads/omp-par-scope.exp: nested_parallel: outer_threads: outer stop: print num
@@ -75678,7 +75661,7 @@
 PASS: gdb.threads/omp-par-scope.exp: single_scope: first thread: get valueof "thread_num"
 PASS: gdb.threads/omp-par-scope.exp: single_scope: first thread: print i1
 PASS: gdb.threads/omp-par-scope.exp: single_scope: first thread: print i2
-KFAIL: gdb.threads/omp-par-scope.exp: single_scope: first thread: print i3 (PRMS: gdb/22214)
+PASS: gdb.threads/omp-par-scope.exp: single_scope: first thread: print i3
 PASS: gdb.threads/omp-par-scope.exp: single_scope: first thread: print s1
 PASS: gdb.threads/omp-par-scope.exp: single_scope: first thread: print s2
 PASS: gdb.threads/omp-par-scope.exp: single_scope: first thread: print s3
@@ -75686,7 +75669,7 @@
 PASS: gdb.threads/omp-par-scope.exp: single_scope: second thread: get valueof "thread_num"
 PASS: gdb.threads/omp-par-scope.exp: single_scope: second thread: print i1
 PASS: gdb.threads/omp-par-scope.exp: single_scope: second thread: print i2
-PASS: gdb.threads/omp-par-scope.exp: single_scope: second thread: print i3
+KFAIL: gdb.threads/omp-par-scope.exp: single_scope: second thread: print i3 (PRMS: gdb/22214)
 PASS: gdb.threads/omp-par-scope.exp: single_scope: second thread: print s1
 PASS: gdb.threads/omp-par-scope.exp: single_scope: second thread: print s2
 PASS: gdb.threads/omp-par-scope.exp: single_scope: second thread: print s3
@@ -75799,7 +75782,7 @@
 PASS: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=1: probe for target remote
 PASS: gdb.threads/process-dies-while-handling-bp.exp: non_stop=off: cond_bp_target=1: set breakpoint that evals false
 PASS: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=0: continue &
-KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=0: inferior 1 exited (memory error) (PRMS: gdb/18749)
+KFAIL: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=0: inferior 1 exited (prompt) (PRMS: gdb/18749)
 PASS: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=0: probe for target remote
 PASS: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=0: set breakpoint that evals false
 PASS: gdb.threads/process-dies-while-handling-bp.exp: non_stop=on: cond_bp_target=1: continue &
@@ -77532,12 +77515,12 @@
 
 		=== gdb Summary ===
 
-# of expected passes		76351
-# of unexpected failures	828
+# of expected passes		76363
+# of unexpected failures	796
 # of expected failures		69
-# of known failures		104
+# of known failures		107
 # of untested testcases		44
 # of unresolved testcases	5
 # of unsupported tests		118
-/home/ed/gnu/gdb-build-1/gdb/testsuite/../../gdb/gdb version  10.0.50.20200404-git -nw -nx -data-directory /home/ed/gnu/gdb-build-1/gdb/testsuite/../data-directory 
+/home/ed/gnu/gdb-build-2/gdb/testsuite/../../gdb/gdb version  10.0.50.20200404-git -nw -nx -data-directory /home/ed/gnu/gdb-build-2/gdb/testsuite/../data-directory