From 094063de43e5d987aacfa69f3f11885e24ea7089 Mon Sep 17 00:00:00 2001
From: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Date: Fri, 4 Mar 2011 17:11:35 +0000
Subject: [PATCH] Quick fix to always correctly update <passed> in setup_bbcc

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11581
---
 callgrind/bbcc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/callgrind/bbcc.c b/callgrind/bbcc.c
index 4b01b97b91..de57ad2d65 100644
--- a/callgrind/bbcc.c
+++ b/callgrind/bbcc.c
@@ -841,6 +841,8 @@ void CLG_(setup_bbcc)(BB* bb)
     if (!skip && CLG_(current_state).nonskipped) {
       /* a call from skipped to nonskipped */
       CLG_(current_state).bbcc = CLG_(current_state).nonskipped;
+      /* FIXME: take the real passed count from shadow stack */
+      passed = CLG_(current_state).bbcc->bb->cjmp_count;
     }
     CLG_(push_call_stack)(CLG_(current_state).bbcc, passed,
 			 bbcc, sp, skip);
-- 
2.47.3