Re: [patch] cleanup: Wunused infrun, jit

[Aleksandar Ristovski <aristovski at qnx dot com>]

On 13-01-31 12:47 PM, Tom Tromey wrote:
> > > > > > "Aleksandar" == Aleksandar Ristovski <aristovski@qnx.com> writes:
>
> Aleksandar>         * infrun.c (handle_syscall_event): Remove unused GDBARCH.
> Aleksandar>         (save_infcall_suspend_state): Remove unused INF.
> Aleksandar>         (restore_infcall_suspend_state): Remove unused INF.
> Aleksandar>         * jit.c (jit_register_code): Remove unused I, B, INF_DATA.
> Aleksandar>         (jit_frame_sniffer): Remove unused INF_DATA.
>
> Mostly ok with the renaming.
>
> Aleksandar> @@ -6745,7 +6743,6 @@ save_infcall_suspend_state (void)
> Aleksandar>  {
> Aleksandar>    struct infcall_suspend_state *inf_state;
> Aleksandar>    struct thread_info *tp = inferior_thread ();
> Aleksandar> -  struct inferior *inf = current_inferior ();
>
> This one and the one in restore_infcall_suspend_state are weird.
> They refer to commented-out code.
>
> Later in the function:
>
> #if 0 /* Currently unused and empty structures are not valid C.  */
>    inf_state->inferior_suspend = inf->suspend;
> #endif
>
> The type "definition":
>
> #if 0 /* Currently unused and empty structures are not valid C.  */
> struct inferior_suspend_state
> {
> };
> #endif
>
>
> If you want to #if 0 the definitions, I'll approve that.
> Otherwise I think Pedro or Jan should weigh in.
>
> The rest is ok.

New patch, with #if 0 instead of deletion attached for reference.

ChangeLog slightly changed (and name casing fixed):


        * infrun.c (handle_syscall_event): Remove unused gdbarch.
        (save_infcall_suspend_state): Ifdef out unused inf.
        (restore_infcall_suspend_state): Ifdef out unused inf.
        * jit.c (jit_register_code): Remove unused i, b, inf_data.
        (jit_frame_sniffer): Remove unused inf_data.

I'll consider your 'ok' still applies and go ahead with the commit shortly.


Thank you,

Aleksandar Ristovski
QNX Software Systems



Index: gdb/infrun.c
===================================================================
RCS file: /cvs/src/src/gdb/infrun.c,v
retrieving revision 1.573
diff -u -p -r1.573 infrun.c
--- gdb/infrun.c	18 Jan 2013 03:03:42 -0000	1.573
+++ gdb/infrun.c	31 Jan 2013 19:09:09 -0000
@@ -3073,14 +3073,12 @@ static int
 handle_syscall_event (struct execution_control_state *ecs)
 {
   struct regcache *regcache;
-  struct gdbarch *gdbarch;
   int syscall_number;
 
   if (!ptid_equal (ecs->ptid, inferior_ptid))
     context_switch (ecs->ptid);
 
   regcache = get_thread_regcache (ecs->ptid);
-  gdbarch = get_regcache_arch (regcache);
   syscall_number = ecs->ws.value.syscall_number;
   stop_pc = regcache_read_pc (regcache);
 
@@ -6745,7 +6743,9 @@ save_infcall_suspend_state (void)
 {
   struct infcall_suspend_state *inf_state;
   struct thread_info *tp = inferior_thread ();
+#if 0
   struct inferior *inf = current_inferior ();
+#endif
   struct regcache *regcache = get_current_regcache ();
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   gdb_byte *siginfo_data = NULL;
@@ -6800,7 +6800,9 @@ void
 restore_infcall_suspend_state (struct infcall_suspend_state *inf_state)
 {
   struct thread_info *tp = inferior_thread ();
+#if 0
   struct inferior *inf = current_inferior ();
+#endif
   struct regcache *regcache = get_current_regcache ();
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
 
Index: gdb/jit.c
===================================================================
RCS file: /cvs/src/src/gdb/jit.c,v
retrieving revision 1.45
diff -u -p -r1.45 jit.c
--- gdb/jit.c	21 Jan 2013 18:13:13 -0000	1.45
+++ gdb/jit.c	31 Jan 2013 19:09:09 -0000
@@ -926,9 +926,7 @@ static void
 jit_register_code (struct gdbarch *gdbarch,
                    CORE_ADDR entry_addr, struct jit_code_entry *code_entry)
 {
-  int i, success;
-  const struct bfd_arch_info *b;
-  struct jit_inferior_data *inf_data = get_jit_inferior_data ();
+  int success;
 
   if (jit_debug)
     fprintf_unfiltered (gdb_stdlog,
@@ -1115,13 +1113,10 @@ static int
 jit_frame_sniffer (const struct frame_unwind *self,
                    struct frame_info *this_frame, void **cache)
 {
-  struct jit_inferior_data *inf_data;
   struct jit_unwind_private *priv_data;
   struct gdb_unwind_callbacks callbacks;
   struct gdb_reader_funcs *funcs;
 
-  inf_data = get_jit_inferior_data ();
-
   callbacks.reg_get = jit_unwind_reg_get_impl;
   callbacks.reg_set = jit_unwind_reg_set_impl;
   callbacks.target_read = jit_target_read_impl;