gdb: move some variables to an inner scope in save_waitstatus

Message ID 20210429035451.1825919-1-simon.marchi@polymtl.ca
State New
Headers show
Series
  • gdb: move some variables to an inner scope in save_waitstatus
Related show

Commit Message

Magne Hov via Gdb-patches April 29, 2021, 3:54 a.m.
These two variables:

      struct regcache *regcache = get_thread_regcache (tp);
      const address_space *aspace = regcache->aspace ();

are only needed inside the "if".  Getting a thread's regcache is a
somewhat expensive operation, so it's good to avoid it if not necessary.
Move the variable declarations and their initialization to the "if"
scope.

gdb/ChangeLog:

	* infrun.c (save_waitstatus): Move variables to inner scope.

Change-Id: Ief1463728755b4dcc142c0a0a76896e9d594ae84
---
 gdb/infrun.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

-- 
2.30.1

Comments

Andrew Burgess April 29, 2021, 7:46 a.m. | #1
* Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> [2021-04-28 23:54:51 -0400]:

> These two variables:

> 

>       struct regcache *regcache = get_thread_regcache (tp);

>       const address_space *aspace = regcache->aspace ();

> 

> are only needed inside the "if".  Getting a thread's regcache is a

> somewhat expensive operation, so it's good to avoid it if not necessary.

> Move the variable declarations and their initialization to the "if"

> scope.

> 

> gdb/ChangeLog:

> 

> 	* infrun.c (save_waitstatus): Move variables to inner scope.


LGTM.

Thanks,
Andrew

> 

> Change-Id: Ief1463728755b4dcc142c0a0a76896e9d594ae84

> ---

>  gdb/infrun.c | 5 ++---

>  1 file changed, 2 insertions(+), 3 deletions(-)

> 

> diff --git a/gdb/infrun.c b/gdb/infrun.c

> index cfec07994f4c..90bab8d984f5 100644

> --- a/gdb/infrun.c

> +++ b/gdb/infrun.c

> @@ -4703,12 +4703,11 @@ save_waitstatus (struct thread_info *tp, const target_waitstatus *ws)

>    tp->suspend.waitstatus = *ws;

>    tp->suspend.waitstatus_pending_p = 1;

>  

> -  struct regcache *regcache = get_thread_regcache (tp);

> -  const address_space *aspace = regcache->aspace ();

> -

>    if (ws->kind == TARGET_WAITKIND_STOPPED

>        && ws->value.sig == GDB_SIGNAL_TRAP)

>      {

> +      struct regcache *regcache = get_thread_regcache (tp);

> +      const address_space *aspace = regcache->aspace ();

>        CORE_ADDR pc = regcache_read_pc (regcache);

>  

>        adjust_pc_after_break (tp, &tp->suspend.waitstatus);

> -- 

> 2.30.1

>
Magne Hov via Gdb-patches April 29, 2021, 2:17 p.m. | #2
On 2021-04-29 3:46 a.m., Andrew Burgess wrote:
> * Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> [2021-04-28 23:54:51 -0400]:

> 

>> These two variables:

>>

>>       struct regcache *regcache = get_thread_regcache (tp);

>>       const address_space *aspace = regcache->aspace ();

>>

>> are only needed inside the "if".  Getting a thread's regcache is a

>> somewhat expensive operation, so it's good to avoid it if not necessary.

>> Move the variable declarations and their initialization to the "if"

>> scope.

>>

>> gdb/ChangeLog:

>>

>> 	* infrun.c (save_waitstatus): Move variables to inner scope.

> 

> LGTM.

> 

> Thanks,

> Andrew


Pushed, thanks.

Simon

Patch

diff --git a/gdb/infrun.c b/gdb/infrun.c
index cfec07994f4c..90bab8d984f5 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -4703,12 +4703,11 @@  save_waitstatus (struct thread_info *tp, const target_waitstatus *ws)
   tp->suspend.waitstatus = *ws;
   tp->suspend.waitstatus_pending_p = 1;
 
-  struct regcache *regcache = get_thread_regcache (tp);
-  const address_space *aspace = regcache->aspace ();
-
   if (ws->kind == TARGET_WAITKIND_STOPPED
       && ws->value.sig == GDB_SIGNAL_TRAP)
     {
+      struct regcache *regcache = get_thread_regcache (tp);
+      const address_space *aspace = regcache->aspace ();
       CORE_ADDR pc = regcache_read_pc (regcache);
 
       adjust_pc_after_break (tp, &tp->suspend.waitstatus);