Merge r6064 (callgrind_annotate: fix warnings with "--collect-jumps=yes")

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6067

diff --git a/callgrind/callgrind_annotate.in b/callgrind/callgrind_annotate.in
index 859d51a96b10a07638d6bca8e760f76bf34b8041..68703b163a63d516cc2b24a2d7dffb79bb7c18b7 100644 (file)
--- a/callgrind/callgrind_annotate.in
+++ b/callgrind/callgrind_annotate.in
@@ -634,6 +634,16 @@ sub read_input_file()
         } elsif (s/^(jump|jcnd)=//) {
          #ignore jump information
 
+        } elsif (s/^jfi=(.*)$//) {
+          # side effect needed: possibly add compression mapping 
+          uncompressed_name("fl",$1);
+          # ignore jump information    
+
+        } elsif (s/^jfn=(.*)$//) {
+          # side effect needed: possibly add compression mapping
+          uncompressed_name("fn",$1);
+          # ignore jump information
+
         } elsif (s/^totals:\s+//) {
          #ignore