Patch 6 in a revised series of cleanup patches from Will Schmidt

    Fix multipleinheritance heuristic for ppc64LE (leak_cpp_interior test).
    Adjust the PPC64 #ifdiffery to indicate that ppc64BE uses a thunk table,
    but ppc64LE (in particular, the ELF ABIV2) does not.  In this case, thunk
    table == function descriptors.

    Signed-off-by: Will Schmidt <will_schmidt@vnet.ibm.com>
    --

    This patch replaces the previously posted "[6/7] add leak_cpp_interior
    test .exp results ....."

This patch fixes Vagrind bugzilla 347686

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

diff --git a/memcheck/mc_leakcheck.c b/memcheck/mc_leakcheck.c
index 75ff3f2edf8ad2e68f178b0469f71fa0af81121f..791a5c1b4fd6e00f6320b850fd5b7ef930b759fd 100644 (file)
--- a/memcheck/mc_leakcheck.c
+++ b/memcheck/mc_leakcheck.c
@@ -648,9 +648,9 @@ static Bool aligned_ptr_above_page0_is_vtable_addr(Addr ptr)
       if (pot_fn == 0)
          continue; // NULL fn pointer. Seems it can happen in vtable.
       seg = VG_(am_find_nsegment) (pot_fn);
-#if defined(VGA_ppc64be) || defined(VGA_ppc64le)
-      // ppc64 use a thunk table. So, we have one more level of indirection
-      // to follow.
+#if defined(VGA_ppc64be)
+      // ppc64BE uses a thunk table (function descriptors), so we have one
+      // more level of indirection to follow.
       if (seg == NULL
           || seg->kind != SkFileC
           || !seg->hasR