From: Julian Seward <jseward@acm.org>
Date: Mon, 14 Feb 2011 09:50:31 +0000 (+0000)
Subject: Merge from trunk, r11497 (fix perl bug in callgrind_annotate.in)
X-Git-Tag: svn/VALGRIND_3_6_1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b64c21049775ac3421d1df3fe39b8242778eb895;p=thirdparty%2Fvalgrind.git

Merge from trunk, r11497 (fix perl bug in callgrind_annotate.in)


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_6_BRANCH@11543
---

diff --git a/callgrind/callgrind_annotate.in b/callgrind/callgrind_annotate.in
index afa9e04bff..9d711e2ec9 100644
--- a/callgrind/callgrind_annotate.in
+++ b/callgrind/callgrind_annotate.in
@@ -541,14 +541,12 @@ sub read_input_file()
 	    if ($curr_call_counter>0) {
 #	      print "Read ($curr_name => $curr_cname) $curr_call_counter\n";
 
-	      if (defined $call_CCs{$curr_name,$curr_cname}) {
-		add_array_a_to_b($CC, $call_CCs{$curr_name,$curr_cname});
-		$call_counter{$curr_name,$curr_cname} += $curr_call_counter;
-	      }
-	      else {
-		$call_CCs{$curr_name,$curr_cname} = $CC;
-		$call_counter{$curr_name,$curr_cname} = $curr_call_counter;
+	      if (!defined $call_CCs{$curr_name,$curr_cname}) {
+		$call_CCs{$curr_name,$curr_cname} = [];
+		$call_counter{$curr_name,$curr_cname} = 0;
 	      }
+	      add_array_a_to_b($CC, $call_CCs{$curr_name,$curr_cname});
+	      $call_counter{$curr_name,$curr_cname} += $curr_call_counter;
 
 	      my $tmp = $called_from_line->{$curr_file,$curr_line_num};
 	      if (!defined $tmp) {
@@ -557,14 +555,12 @@ sub read_input_file()
 	      $tmp = {} unless defined $tmp;
 	      $$tmp{$curr_cname} = 1;
 	      $called_from_line->{$curr_file,$curr_line_num} = $tmp;
-	      if(defined $call_CCs{$curr_name,$curr_cname,$curr_line_num}) {
-	        add_array_a_to_b($CC, $call_CCs{$curr_name,$curr_cname,$curr_line_num});
-	        $call_counter{$curr_name,$curr_cname,$curr_line_num} += $curr_call_counter;
-              }
-              else {
-	        $call_CCs{$curr_name,$curr_cname,$curr_line_num} = $CC;
-	        $call_counter{$curr_name,$curr_cname,$curr_line_num} = $curr_call_counter;
-              }
+	      if (!defined $call_CCs{$curr_name,$curr_cname,$curr_line_num}) {
+		$call_CCs{$curr_name,$curr_cname,$curr_line_num} = [];
+		$call_counter{$curr_name,$curr_cname,$curr_line_num} = 0;
+	      }
+	      add_array_a_to_b($CC, $call_CCs{$curr_name,$curr_cname,$curr_line_num});
+	      $call_counter{$curr_name,$curr_cname,$curr_line_num} += $curr_call_counter;
 
 	      $curr_call_counter = 0;