Merge, from trunk, 14618

14618  Handle (by ignoring) Imbe_CancelReservation. (hg)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_10_BRANCH@14752

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index ef3104140469e01321f6c55867b2fdba561d5a49..272f0cbb3dee956bf07cc7c7ce47f85abcfbddc9 100644 (file)
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -4568,6 +4568,7 @@ IRSB* hg_instrument ( VgCallbackClosure* closure,
          case Ist_MBE:
             switch (st->Ist.MBE.event) {
                case Imbe_Fence:
+               case Imbe_CancelReservation:
                   break; /* not interesting */
                default:
                   goto unhandled;