[4/4] gdb: After inferior call, finish all threads in process

diff --git a/gdb/infcall.c b/gdb/infcall.c
index b13f5b61d96..b33123d6c75 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -658,7 +658,7 @@  run_inferior_call (struct call_thread_fsm *sm,
   if (!was_running
       && ptid_equal (call_thread_ptid, inferior_ptid)
       && stop_stack_dummy == STOP_STACK_DUMMY)
-    finish_thread_state (user_visible_resume_ptid (0));
+    finish_thread_state (pid_to_ptid (ptid_get_pid (inferior_ptid)));
 
   enable_watchpoints_after_interactive_call_stop ();
 
diff --git a/gdb/testsuite/gdb.threads/infcall-create-thread.c b/gdb/testsuite/gdb.threads/infcall-create-thread.c
new file mode 100644
index 00000000000..165487d5981
--- /dev/null
+++ b/gdb/testsuite/gdb.threads/infcall-create-thread.c
@@ -0,0 +1,89 @@ 
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2018 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <unistd.h>
+
+/* This defines the maximum number of threads to spawn.  */
+#define THREADCOUNT 4
+
+/* Define global thread identifiers.  */
+static pthread_t threads[THREADCOUNT];
+
+/* Next thread ID to fill in.  */
+static int next_thread = 0;
+
+/* Encapsulate the synchronization of the threads. Perform a barrier before
+   and after the computation.  */
+static void *
+thread_function (void *args)
+{
+   while (1)
+    sleep (5);
+}
+
+/* Create a new thread.  */
+static void
+spawn_thread ()
+{
+  int err;
+
+  if (next_thread == THREADCOUNT)
+    {
+      fprintf (stderr, "Attempt to create too many threads.\n");
+      exit (EXIT_FAILURE);
+    }
+
+  err = pthread_create (&threads[next_thread], NULL, thread_function, NULL);
+  if (err != 0)
+    {
+      fprintf (stderr, "Thread creation failed\n");
+      exit (EXIT_FAILURE);
+    }
+
+  ++next_thread;
+}
+
+/* Place a breakpoint on this function.  */
+void
+breakpt ()
+{
+  asm ("" ::: "memory");
+}
+
+int
+main ()
+{
+  /* Create the worker threads.  */
+  breakpt ();
+  printf ("Spawning worker threads\n");
+  for (int tid = 0; tid < 2 /*THREADCOUNT*/; ++tid)
+    {
+      spawn_thread ();
+      breakpt ();
+    }
+
+  /* Wait for the threads to complete then exit.  Currently threads block
+     for ever and this will never complete, but it serves to block the
+     main thread.  */
+  for (int tid = 0; tid < THREADCOUNT; ++tid)
+    pthread_join (threads[tid], NULL);
+
+  return EXIT_SUCCESS;
+}
diff --git a/gdb/testsuite/gdb.threads/infcall-create-thread.exp b/gdb/testsuite/gdb.threads/infcall-create-thread.exp
new file mode 100644
index 00000000000..634d5f44b1e
--- /dev/null
+++ b/gdb/testsuite/gdb.threads/infcall-create-thread.exp
@@ -0,0 +1,71 @@ 
+# Copyright (C) 2018 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+# Check the state of gdb after an inferior call creates a new thread.
+
+standard_testfile
+
+if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
+  executable {debug}] != "" } {
+  return -1
+}
+
+foreach_with_prefix use_schedlock { 0 1 } {
+
+    clean_restart "${binfile}"
+
+    if ![runto_main] then {
+	fail "can't run to main"
+	return 0
+    }
+
+    gdb_breakpoint "breakpt"
+    gdb_continue_to_breakpoint "breakpt"
+
+    if { $use_schedlock } {
+	gdb_test_no_output "set scheduler-locking on"
+	gdb_test "show scheduler-locking" \
+	    "Mode for locking scheduler during execution is \"on\"."
+    }
+
+    gdb_test "call spawn_thread ()" "\[New Thread $hex \\(LWP $decimal\\)\]" \
+	"spawn a new thread in an inferior call"
+
+    set seen_thr_1 0
+    set seen_thr_2 0
+    set test_name "check new thread is not running"
+    gdb_test_multiple "info threads" $test_name {
+	-re "\[^\r\n\]+Id\[^\r\n\]+Target Id\[^\r\n\]+Frame\[^\r\n\]+\[\r\n\]+" {
+	    exp_continue
+	}
+	-re "^\\*\[^\r\n0-9\]+1 \[^\r\n\]+breakpt \\(\\) at \[^\r\n\]+\[\r\n\]+" {
+	    # Thread 1 is active thread, and is NOT running.
+	    set seen_thr_1 1
+	    exp_continue
+	}
+	-re "^\[^*\r\n0-9\]+2 \[^\r\n\]+ (in|at) \[^\r\n\]+\[\r\n\]+" {
+	    set seen_thr_2 1
+	    exp_continue
+	}
+	-re "^\[^\r\n0-9\]+(1|2) \[^\r\n\]+\\(running\\)\[\r\n\]+" {
+	    fail "$test_name"
+	    exp_continue
+	}
+	-re "$gdb_prompt $" {
+	}
+    }
+
+    gdb_assert { $seen_thr_1 && $seen_thr_2 } "seen thread 1 and 2"
+}