Fix for branch prediction: handle calls via function pointer

Calls via function pointers are indirect branches, and thus
should call into the indirect branch predictor simulation.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11212

diff --git a/callgrind/main.c b/callgrind/main.c
index e36ba8a18762b1ace7b75dd7e290ed682c9116c5..2dd7e18a99b85d79405912fc4b4a8eb5a052088b 100644 (file)
--- a/callgrind/main.c
+++ b/callgrind/main.c
@@ -1180,7 +1180,7 @@ IRSB* CLG_(instrument)( VgCallbackClosure* closure,
    /* Deal with branches to unknown destinations.  Except ignore ones
       which are function returns as we assume the return stack
       predictor never mispredicts. */
-   if (sbIn->jumpkind == Ijk_Boring) {
+   if ((sbIn->jumpkind == Ijk_Boring) || (sbIn->jumpkind == Ijk_Call)) {
       if (0) { ppIRExpr( sbIn->next ); VG_(printf)("\n"); }
       switch (sbIn->next->tag) {
          case Iex_Const: