[PATCH] gprof: fix disappearing inlined functions

[Richard Allen]

Load the function names from line/debug-symbols if available.

The following test spends most of its CPU cycles mathing the
long way around in xorshift_reverse(), but prior to this patch
gprof would show 100% CPU spent in main().

  #include <inttypes.h>
  #include <stdint.h>
  #include <stdio.h>

  static uint32_t xorshift_forward(uint32_t x) {
      x ^= x << 13;
      x ^= x >> 17;
      x ^= x << 5;
      return x;
  }

  static uint32_t xorshift_reverse(uint32_t x){
    for(uint32_t i = 1; i < 4294967295; ++i){
      x ^= x << 13;
      x ^= x >> 17;
      x ^= x << 5;
    }
    return x;
  }

  int main(){
    uint32_t x = 1;
    uint32_t x_minus = xorshift_reverse(x);
    uint32_t x_minus_plus = xorshift_forward(x_minus);
    printf("x:%" PRIu32 " x-:%" PRIu32 " x-+:%" PRIu32 "\n", x, x_minus, x_minus_plus);
    return 0;
  }



---
 gprof/corefile.c | 2 +-
 gprof/gprof.c    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gprof/corefile.c b/gprof/corefile.c
index 712dd243e90..b79da05e7b2 100644
--- a/gprof/corefile.c
+++ b/gprof/corefile.c
@@ -881,7 +881,7 @@ core_create_line_syms (void)
 
 	    if (!get_src_info (vma, &filename, &ltab.limit->name,
 			       &ltab.limit->line_num)
-		|| (prev.name && prev.line_num == ltab.limit->line_num
+		|| (prev.name && (!line_granularity || prev.line_num == ltab.limit->line_num)
 		    && strcmp (prev.name, ltab.limit->name) == 0
 		    && filename_cmp (prev.file->name, filename) == 0))
 	      continue;
diff --git a/gprof/gprof.c b/gprof/gprof.c
index cea269bc80f..926581fe17e 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -641,10 +641,8 @@ symtab_init (void)
   /* Create symbols from core image.  */
   if (external_symbol_table)
     core_create_syms_from (external_symbol_table);
-  else if (line_granularity)
-    core_create_line_syms ();
   else
-    core_create_function_syms ();
+    core_create_line_syms ();
 
   /* Translate sym specs into syms.  */
   sym_id_parse ();
-- 
2.47.3