From: Julian Seward <jseward@acm.org>
Date: Thu, 14 Sep 2006 20:10:19 +0000 (+0000)
Subject: Merge r6064 (callgrind_annotate: fix warnings with "--collect-jumps=yes")
X-Git-Tag: svn/VALGRIND_3_2_1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f2fc6f538b08f8c1e76e52a1602a933eb4edf84;p=thirdparty%2Fvalgrind.git

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 859d51a96b..68703b163a 100644
--- 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