From 8dc3273e0c50b607ee97873ae745cbc0d3ec6d7f Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 15 Jan 2020 12:47:44 -0500 Subject: [PATCH] Use get_thread_regcache instead of get_current_regcache in post_create_inferior In post_create_inferior, we get the current thread using the inferior_thread function and store it in `thr`. We then call get_current_regcache immediately after, which does: return get_thread_regcache (inferior_thread ()); This patch makes post_create_inferior use get_thread_regcache, passing `thr`, saving an unnecessary inferior_thread call. gdb/ChangeLog: * infcmd.c (post_create_inferior): Use get_thread_regcache instead of get_current_regcache. --- gdb/ChangeLog | 5 +++++ gdb/infcmd.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d348abbf585..cd89a44733a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-01-15 Simon Marchi + + * infcmd.c (post_create_inferior): Use get_thread_regcache + instead of get_current_regcache. + 2020-01-14 Tom Tromey PR symtab/12535: diff --git a/gdb/infcmd.c b/gdb/infcmd.c index cf8b312f9db..3e7c43fab52 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -441,7 +441,8 @@ post_create_inferior (struct target_ops *target, int from_tty) thr->suspend.stop_pc = 0; try { - thr->suspend.stop_pc = regcache_read_pc (get_current_regcache ()); + regcache *rc = get_thread_regcache (thr); + thr->suspend.stop_pc = regcache_read_pc (rc); } catch (const gdb_exception_error &ex) { -- 2.30.2