Revert "fix(callgrind): drop BBCCs whose top context fn is skip-flagged"

This reverts commit bcfb4c9.

Author: not-matthias

callgrind/dump.c

@@ -1553,17 +1553,7 @@ static void print_bbccs_of_thread(thread_info* ti)
     }
 
     if (*p == 0) break;
-
-    /* Don't emit BBCCs whose top context fn is flagged for obj-skip.
-     * This happens when the (cxt == 0) clause in setup_bbcc force-
-     * pushes a skipped fn (first BB after instrumentation start that
-     * landed in a skipped object). Without this filter the skipped fn
-     * leaks into the dump as a top-level fn= block. */
-    if ((*p)->cxt->fn[0]->skip) {
-      p++;
-      continue;
-    }
-
+    
     if (print_fn_pos(print_fp, &lastFnPos, *p)) {
 
       /* new function */

callgrind/tests/runtime_obj_skip_c.vgtest

@@ -1,5 +1,5 @@
 prereq: test -f runtime_obj_skip_c && test -f runtime_obj_skip_c_lib.so
 prog-asis: ./runtime_obj_skip_c
 vgopts: --instr-atstart=no --compress-strings=no --callgrind-out-file=callgrind.out.runtime_obj_skip_c
-post: sh -c 'if grep -q "^fn=skipme" callgrind.out.runtime_obj_skip_c; then echo "FAIL: skipme_* leaked into top-level fn= block"; else echo OK; fi'
+post: sh -c 'if grep -q "^fn=skipme_func" callgrind.out.runtime_obj_skip_c; then echo "FAIL: skipme_func leaked into top-level fn= block"; else echo OK; fi'
 cleanup: rm -f callgrind.out.runtime_obj_skip_c