From: Carl Love Date: Fri, 15 May 2015 16:50:06 +0000 (+0000) Subject: Patch 6 in a revised series of cleanup patches from Will Schmidt X-Git-Tag: svn/VALGRIND_3_11_0~384 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a62d8a4650a0808abb6d0386336a03342aeaecf;p=thirdparty%2Fvalgrind.git 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 -- 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 75ff3f2edf..791a5c1b4f 100644 --- 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