[Bug exp/30911] [gdb/exp] Cannot call ifunc strstr with debuginfo installed

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=30911

--- Comment #1 from Tom de Vries <vries at gcc dot gnu.org> ---
Tentative fix: swap the order here:
...
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 0f9ad34bbb4..20d0f9acca5 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -316,17 +316,20 @@ find_function_addr (struct value *function,
             FUNCTION_TYPE have been asked for.  */
          if (retval_type != NULL || function_type != NULL)
            {
-             type *target_ftype = find_function_type (funaddr);
-             /* If we don't have debug info for the target function,
-                see if we can instead extract the target function's
-                type from the type that the resolver returns.  */
-             if (target_ftype == NULL)
-               target_ftype = find_gnu_ifunc_target_type (resolver_addr);
+             /* Try to get the target function's type from the type that
+                the resolver returns.  We do this first to work around
+                PR gas/29517. */
+             type *target_ftype = find_gnu_ifunc_target_type (resolver_addr);
              if (target_ftype != NULL)
                {
                  value_type = check_typedef (target_ftype)->target_type ();
                  ftype = target_ftype;
                }
+
+             /* Try to get the target function's type from the target
+                function. */
+             if (target_ftype == NULL)
+               target_ftype = find_function_type (funaddr);
            }
        }
       else
...

-- 
You are receiving this mail because:
You are on the CC list for the bug.