Use the newly-added dopyIRBBExceptStmts() in tools.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6372 a5019735-40e9-0310-863c-91ae7b9d1cf9

1 files changed, 2 insertions, 6 deletions

diff --git a/cachegrind/cg_main.c b/cachegrind/cg_main.c
index e1ccc41e..f61c801c 100644
--- a/cachegrind/cg_main.c
+++ b/cachegrind/cg_main.c
@@ -724,12 +724,8 @@ IRBB* cg_instrument ( VgCallbackClosure* closure,
       VG_(tool_panic)("host/guest word size mismatch");
    }
 
-   /* Set up BB, including copying of the where-next stuff. */
-   cgs.bbOut           = emptyIRBB();
-   cgs.bbOut->tyenv    = dopyIRTypeEnv(tyenv);
-   tl_assert( isIRAtom(bbIn->next) );
-   cgs.bbOut->next     = dopyIRExpr(bbIn->next);
-   cgs.bbOut->jumpkind = bbIn->jumpkind;
+   // Set up new BB
+   cgs.bbOut = dopyIRBBExceptStmts(bbIn);
 
    // Copy verbatim any IR preamble preceding the first IMark
    i = 0;